Changeset 38316 for main/trunk/greenstone3

Timestamp:

2023-10-16T16:23:07+13:00 (8 months ago)

Author:

anupama

Message:

Incremental change to allow user editing for any accounts who have collection editing powers (not just admin). Future changse would be a full overhaul as they'll happen in the document editor and are unlikely to use the new remove-metadata-array methods.

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (1 diff)
• web/interfaces/default/transform/layouts/usercomments.xsl (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -339 +339 @@
         String lang = request.getAttribute(GSXML.LANG_ATT);
         
-        boolean isAdminRemovingUserComments = false;
-        
-        // Have to be admin to do remove-metadata-array for user comments meta fields
-        if (metaserver_command.equals("remove-metadata-array")) {
-        // check if only removing user comments metadata fields
-        docids = getDocIdsWithOptFilter(json_str, allowedMetaFieldsPattern);
-        if(docids != null) {
-            isAdminRemovingUserComments = true;
-        }
-
-        if(!userIsAdministrator(request, params)) {
-            isAdminRemovingUserComments = false;
-            return errorResponse("processModifyMetadata", NO_PERMISSIONS_ERROR, lang);
-        }       
-        }
-
-        if(isAdminRemovingUserComments) {
-        // everything is set up already now for admin to remove user comments
-        }       
-        else if (userHasCollectionEditPermissions(request, params)) { // means user can modify ANY metadata
-
+        if (userHasCollectionEditPermissions(request, params)) { // means user can modify ANY metadata
+        if (metaserver_command.equals("remove-metadata-array")) {
+            // check if only removing user comments metadata fields
+            docids = getDocIdsWithOptFilter(json_str, allowedMetaFieldsPattern);
+            if(docids == null) {
+            // removing multiple metadata that are Not user comments
+            // can be done by any user with collection edit permissions
+            docids = getDocIdsWithOptFilter(json_str, null);
+            }
+        }
         // if dealing with an array of meta, then parse out the docids from the json
-        if(supportsSettingMultipleMeta) {
-            docids = getDocIdsWithOptFilter(json_str, null);
-        } else if (metaserver_command.equals("remove-metadata-array")) {
-            // removing multiple metadata that are Not user comments
-            // can be done by any user with collection edit permissions
+        else if(supportsSettingMultipleMeta) {
             docids = getDocIdsWithOptFilter(json_str, null);
         } // else set-meta operation on single metadata field of single doc, 

main/trunk/greenstone3/web/interfaces/default/transform/layouts/usercomments.xsl

@@ -45 +45 @@
   <gsf:variable name="userCanDeleteComments">
     <xsl:choose>
-      <xsl:when test="/page/pageRequest/userInformation and (util:csvContains(/page/pageRequest/userInformation/@groups, 'administrator'))">1</xsl:when><xsl:otherwise>0</xsl:otherwise>
+      <!--<xsl:when test="/page/pageRequest/userInformation and (util:csvContains(/page/pageRequest/userInformation/@groups, 'administrator'))">1</xsl:when><xsl:otherwise>0</xsl:otherwise>-->
+      <xsl:when test="$canDoEditing = 'true'">1</xsl:when><xsl:otherwise>0</xsl:otherwise>
     </xsl:choose>
   </gsf:variable>