Changeset 7213

Timestamp:

Oct 19, 2016, 2:18:53 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2034: New permission for annotating items

The "Edit annotation" icon in the "Annotations & parameters" tab should be enabled when the logged in user has RESTRICTED_WRITE permission.

The "Save" button in the "Edit annotations" dialog should be enabled if the logged in user has RESTRICTED_WRITE permission.

Location:

trunk/www/common/annotations

Files:

• annotate.jsp (modified) (2 diffs)
• list_annotations.jsp (modified) (1 diff)

trunk/www/common/annotations/annotate.jsp

@@ -113 +113 @@
     item = (Annotatable)itemType.getById(dc, itemId);
   }
-  final boolean writePermission = item == null ? true : item.hasPermission(Permission.WRITE);
+  final boolean annotatePermission = item == null ? true : item.hasPermission(Permission.RESTRICTED_WRITE);
   
   // Load the current item and it's protocol
@@ -792 +792 @@
       </div>
       <base:buttongroup subclass="dialogbuttons topborder">
-        <base:button id="btnSave" title="Save" visible="<%=writePermission%>" />
-        <base:button id="close" title="Cancel"  visible="<%=writePermission%>" />
-        <base:button id="close" title="Close" visible="<%=!writePermission%>" />
+        <base:button id="btnSave" title="Save" visible="<%=annotatePermission%>" />
+        <base:button id="close" title="Cancel"  visible="<%=annotatePermission%>" />
+        <base:button id="close" title="Close" visible="<%=!annotatePermission%>" />
       </base:buttongroup>
       <form name="modified" method="post" action="index.jsp?ID=<%=ID%>">

trunk/www/common/annotations/list_annotations.jsp

@@ -87 +87 @@
 {
   final Annotatable item = (Annotatable)itemType.getById(dc, itemId);
-  final boolean writePermission = item.hasPermission(Permission.WRITE);
+  final boolean writePermission = item.hasPermission(Permission.RESTRICTED_WRITE);
   final SnapshotManager manager = new SnapshotManager();