Changeset 6999

Timestamp:

Nov 4, 2015, 1:14:13 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #1962: Trying to load item with ID=1 as parent item when inheriting annotations

Seems like setting the value to "NaN" when permission is denied (and also for other non-selectable alternative) solves the problem.

Keeping this ticket open in case any side-effects are discovered.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/taglib/Select.java (modified) (3 diffs)
• www/include/scripts/subtypes.js (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/Select.java

@@ -532 +532 @@
     if (isDenied())
     {
-      sb.append("<option value=\"-1\">- denied -\n");
+      sb.append("<option value=\"NaN\">- denied -\n");
     }
     else
@@ -552 +552 @@
       if (recent != null && recent.size() > 0)
       {
-        sb.append("<option value=\"0\" disabled class=\"recentheader\">› recently used\n");
+        sb.append("<option value=\"NaN\" disabled class=\"recentheader\">› recently used\n");
         int i = 1;
         for (BasicItem item : recent)
@@ -576 +576 @@
       if (defaultItems != null && defaultItems.size() > 0)
       {
-        sb.append("<option value=\"0\" disabled class=\"defaultheader\">› project default\n");
+        sb.append("<option value=\"NaN\" disabled class=\"defaultheader\">› project default\n");
         for (BasicItem defaultitem : defaultItems)
         {

trunk/www/include/scripts/subtypes.js

@@ -254 +254 @@
     {
       // Add recently used items
-      var recentlyUsedHeader = new Option('› recently used', 0);
+      var recentlyUsedHeader = new Option('› recently used', 'NaN');
       recentlyUsedHeader.className = 'recentheader';
       recentlyUsedHeader.disabled = true;
@@ -271 +271 @@
     {
       // Add project default items
-      var projectDefaultHeader = new Option('› project default', 0);
+      var projectDefaultHeader = new Option('› project default', 'NaN');
       projectDefaultHeader.className = 'defaultheader';
       projectDefaultHeader.disabled = true;