Changeset 7207 for trunk/www/common/overview/info.jsp

Timestamp:

Oct 19, 2016, 10:42:45 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2033: Permissions for annotating items may be incorrectly implemented

Changes in the web interface (Overview tab) so that the "edit" icon is only visible if the user has permission to modify an annotation.

File:

• trunk/www/common/overview/info.jsp (modified) (2 diffs)

trunk/www/common/overview/info.jsp

@@ -468 +468 @@
                 String icon = at != null && at.isProtocolParameter() ? 
                     "parameter.png" : "annotation.png";
-                boolean editPermission = annotatable.hasPermission(Permission.WRITE);
+                boolean editPermission = snapshot.hasPermission(dc, Permission.WRITE);
                 %>
                 <tbl:row>
@@ -551 +551 @@
                     if (fix == null) continue;
                     BasicItem fixItem = fix.getItem();
-                    boolean enabled = fixItem.hasPermission(Permission.WRITE);
                     AnnotationType at = fix.getAnnotationType();
                     Annotation a = fix.getAnnotation();
+                    boolean enabled = a != null ? 
+                      a.hasPermission(Permission.WRITE) : fixItem.hasPermission(Permission.WRITE);
                     String autoInit = "";
                     if (enabled)