Changeset 3447

Timestamp:

Jun 5, 2007, 8:39:03 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #629. The 'removed' option has been removed from the preset selector since the query
system can't include that as a filter.

Location:

branches/2.3.1

Files:

• src/clients/web/net/sf/basedb/clients/web/taglib/table/PresetSelector.java (modified) (6 diffs)
• www/WEB-INF/table.tld (modified) (1 diff)
• www/admin/diskusage/details/view_details.jsp (modified) (1 diff)

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

@@ -78 +78 @@
   
   /**
-    If the header should be visible or not.
+    If the preset selector should be visible or not.
   */
   private boolean visible = true;
+  
+  /**
+    If the 'removed' option should be included in the preset selector or not.
+    If the list contains items that are not removable, the option is never included.
+  */
+  private boolean disableRemoved = false;
+  
+  /**
+    If the 'owned by me' option should be included in the preset selector or not.
+    If the list contains items that are not ownable, the option is never included.
+  */
+  private boolean disableOwnedBy = false;
+
+  /**
+    If the 'shared to me' option should be included in the preset selector or not.
+    If the list contains items that are not shareable, the option is never included.
+  */
+  private boolean disableSharedTo = false;
+
+  /**
+    If the 'in project' option should be included in the preset selector or not.
+    If the list contains items that are not removable, the option is never included.
+  */
+  private boolean disableInProject = false;
+
+  /**
+    If the 'owned by others' option should be included in the preset selector or not.
+    If the list contains items that are not ownable, the option is never included.
+  */
+  private boolean disableOthers = false;  
   
   private String onChange = "presetOnChange()";
@@ -132 +162 @@
   }
 
+  public void setDisableremoved(boolean disable)
+  {
+    this.disableRemoved = disable;
+  }
+  public boolean getDisableremoved()
+  {
+    return disableRemoved;
+  }
+  
+  public void setDisableownedby(boolean disable)
+  {
+    this.disableOwnedBy = disable;
+  }
+  public boolean getDisableownedby()
+  {
+    return disableOwnedBy;
+  }
+  
+  public void setDisablesharedto(boolean disable)
+  {
+    this.disableSharedTo = disable;
+  }
+  public boolean getDisablesharedto()
+  {
+    return disableSharedTo;
+  }
+  
+  public void setDisableinproject(boolean disable)
+  {
+    this.disableInProject = disable;
+  }
+  public boolean getDisableinproject()
+  {
+    return disableInProject;
+  }
+  
+  public void setDisableothers(boolean disable)
+  {
+    this.disableOthers = disable;
+  }
+  public boolean getDisableothers()
+  {
+    return disableOthers;
+  }
+  
   /*
     Display methods
@@ -194 +269 @@
     if (dataClass != null)
     {
-      if (RemovableData.class.isAssignableFrom(dataClass))
+      if (RemovableData.class.isAssignableFrom(dataClass) && !disableRemoved)
       {
         boolean current = cc.getInclude().contains(Include.REMOVED);
@@ -203 +278 @@
         numOptions++;
       }
-      if (OwnableData.class.isAssignableFrom(dataClass))
+      if (OwnableData.class.isAssignableFrom(dataClass) && !disableOwnedBy)
       {
         boolean current = cc.getInclude().contains(Include.MINE);
@@ -216 +291 @@
         )
       {
-        boolean current = cc.getInclude().contains(Include.SHARED);
-        sb.append("<option value=\"option:shared:").append(current ? "0" : "1").append("\"");
-        sb.append(" title=\"Show/hide items shared to me\">");
-        sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Shared to me\n");
-        table.addHidden("shared", Boolean.toString(current));
-        numOptions++;
+        if (!disableSharedTo)
+        {
+          boolean current = cc.getInclude().contains(Include.SHARED);
+          sb.append("<option value=\"option:shared:").append(current ? "0" : "1").append("\"");
+          sb.append(" title=\"Show/hide items shared to me\">");
+          sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Shared to me\n");
+          table.addHidden("shared", Boolean.toString(current));
+          numOptions++;
+        }
         
-        if (sc.getActiveProjectId() != 0 && !ProjectData.class.isAssignableFrom(dataClass))
+        if (sc.getActiveProjectId() != 0 && !ProjectData.class.isAssignableFrom(dataClass) && !disableInProject)
         {
-          current = cc.getInclude().contains(Include.IN_PROJECT);
+          boolean current = cc.getInclude().contains(Include.IN_PROJECT);
           sb.append("<option value=\"option:inproject:").append(current ? "0" : "1").append("\"");
           sb.append(" title=\"Show/hide items in current project\">");
@@ -234 +312 @@
       }
   
-      if (sc.hasPermission(Permission.READ, itemType) && 
+      if (sc.hasPermission(Permission.READ, itemType) && !disableOthers && 
           (
             OwnableData.class.isAssignableFrom(dataClass) || 

branches/2.3.1/www/WEB-INF/table.tld

@@ -312 +312 @@
       <rtexprvalue>true</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>disableremoved</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>disableownedby</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>disablesharedto</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>disableinproject</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>disableothers</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
   </tag>
 

branches/2.3.1/www/admin/diskusage/details/view_details.jsp

@@ -421 +421 @@
               colspan="3"
               onchange="presetOnChange()"
+              disableremoved="true"
             />
           </tbl:columns>