Changeset 7215

Timestamp:

Oct 19, 2016, 3:47:52 PM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2034: New permission for annotating items

Added "Annotation" to permission filter used for filtering list pages. Made the list "smarter" by excluding permissions that are not defined for an item.

File:

• trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/ColumnDef.java (modified) (1 diff)

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

@@ -745 +745 @@
               sb.append("<option value=\"\">");
               Permission permission = context.getItemPermission();
+              Set<Permission> definedPermission = context.getItemType().getDefinedPermissions();
               hasFilter = permission != null;
               appendPermissionOption(sb, permission, Permission.READ, "Read [R]");
-              appendPermissionOption(sb, permission, Permission.USE, "Use [U]");
-              appendPermissionOption(sb, permission, Permission.WRITE, "Write [W]");
-              appendPermissionOption(sb, permission, Permission.DELETE, "Delete [D]");
-              appendPermissionOption(sb, permission, Permission.SET_OWNER, "Change owner [O]");
-              appendPermissionOption(sb, permission, Permission.SET_PERMISSION, "Change permissions [P]");
+              if (definedPermission.contains(Permission.USE))
+              {
+                appendPermissionOption(sb, permission, Permission.USE, "Use [U]");
+              }
+              if (definedPermission.contains(Permission.RESTRICTED_WRITE))
+              {
+                appendPermissionOption(sb, permission, Permission.RESTRICTED_WRITE, "Annotate [A]");
+              }
+              if (definedPermission.contains(Permission.WRITE))
+              {
+                appendPermissionOption(sb, permission, Permission.WRITE, "Write [W]");
+              }
+              if (definedPermission.contains(Permission.DELETE))
+              {
+                appendPermissionOption(sb, permission, Permission.DELETE, "Delete [D]");
+              }
+              if (definedPermission.contains(Permission.SET_OWNER))
+              {
+                appendPermissionOption(sb, permission, Permission.SET_OWNER, "Change owner [O]");
+              }
+              if (definedPermission.contains(Permission.SET_PERMISSION))
+              {
+                appendPermissionOption(sb, permission, Permission.SET_PERMISSION, "Change permissions [P]");
+              }
               sb.append("</select>");
             }