Changeset 1743

Timestamp:

Jan 9, 2006, 3:38:33 PM (18 years ago)

Author:

Nicklas Nordborg

Message:

PresetSelector? should not show "Owned by others" option for
non-ownable items.

File:

• trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/PresetSelector.java (modified) (6 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/PresetSelector.java

@@ -186 +186 @@
     // Include options
     sb.append("<option value=\"\">------------------\n");
+    int numOptions = 0;
     if (RemovableData.class.isAssignableFrom(itemType.getDataClass()))
     {
@@ -193 +194 @@
       sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Removed\n");
       table.addHidden("removed", Boolean.toString(current));
+      numOptions++;
     }
     if (OwnableData.class.isAssignableFrom(itemType.getDataClass()))
@@ -201 +203 @@
       sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Owned by me\n");
       table.addHidden("owned", Boolean.toString(current));
+      numOptions++;
     }
     if (ShareableData.class.isAssignableFrom(itemType.getDataClass()))
@@ -209 +212 @@
       sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Shared to me\n");
       table.addHidden("shared", Boolean.toString(current));
+      numOptions++;
       
       if (sc.getActiveProjectId() != 0)
@@ -217 +221 @@
         sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("In current project\n");
         table.addHidden("inproject", Boolean.toString(current));
+        numOptions++;
       }
     }
 
-    if (sc.hasPermission(Permission.READ, itemType))
+    if (sc.hasPermission(Permission.READ, itemType) && OwnableData.class.isAssignableFrom(itemType.getDataClass()))
     {
       boolean current = cc.getInclude().contains(Include.OTHERS);
@@ -227 +232 @@
       sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Owned by others\n");
       table.addHidden("others", Boolean.toString(current));
+      numOptions++;
     }
 
     // Context managemenet operations
-    sb.append("<option value=\"\">------------------\n");
+    if (numOptions > 0)
+    {
+      sb.append("<option value=\"\">------------------\n");
+      numOptions = 0;
+    }
     sb.append("<option value=\"clearfilter:\" title=\"Clear all filters\">Clear filter\n");
     sb.append("<option value=\"saveas:\" title=\"Save current settings\">Save as...\n");