Changeset 5264

Timestamp:

Mar 10, 2010, 3:39:45 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1463: HTTP Status 500 when logging in

This should fix the source of the problem. We also need the update code to execute the above SQL to get rid of existing problematic data in the database.

Location:

branches/2.15-stable/src/clients/web/net/sf/basedb/clients/web

Files:

• Base.java (modified) (4 diffs)
• taglib/table/Table.java (modified) (1 diff)

branches/2.15-stable/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -522 +522 @@
       }
       // Visible columns
-      cc.setSetting("columns", Values.getString(request.getParameter("columns"), cc.getSetting("columns")));
+      cc.setSetting("columns", Values.getString(Values.getStringOrNull(request.getParameter("columns")), cc.getSetting("columns")));
 
       // Page settings, ignore negative values, 'rowsperpage' setting may come as an
@@ -540 +540 @@
   
       // Sort property and direction
-      cc.setSortProperty(Values.getString(request.getParameter("sortby"), cc.getSortProperty()));
-      String direction = request.getParameter("direction");
+      cc.setSortProperty(Values.getString(Values.getStringOrNull(request.getParameter("sortby")), cc.getSortProperty()));
+      String direction = Values.getStringOrNull(request.getParameter("direction"));
       if (direction != null)
       {
@@ -557 +557 @@
       
       // Item permission
-      String permission = request.getParameter("permission");
+      String permission = Values.getStringOrNull(request.getParameter("permission"));
       if (permission != null)
       {
@@ -570 +570 @@
       
       // The ID of excluded items in a query
-      String exclude = request.getParameter("exclude");
+      String exclude = Values.getStringOrNull(request.getParameter("exclude"));
       if (exclude == null)
       {

branches/2.15-stable/src/clients/web/net/sf/basedb/clients/web/taglib/table/Table.java

@@ -505 +505 @@
   void addHidden(String name, String value)
   {
-    hiddenForm.append("<input type=\"hidden\" name=\"").append(name).append("\" value=\"").append(value).append("\">\n");
+    hiddenForm.append("<input type=\"hidden\" name=\"").append(name).append("\" value=\"");
+    if (value != null) hiddenForm.append(value);
+    hiddenForm.append("\">\n");
   }