Changeset 38251 for main/trunk/greenstone3

Timestamp:

2023-09-28T16:45:16+13:00 (8 months ago)

Author:

anupama

Message:

Still on removing user comments and the remove-metadata-array methods: 1. Sorting the metapositions array in the crucial *descending* order now is done in the perl remove-metadata-array functions, where it should have been done in the first place, so callers don't need to know to do this. 2. Delete user comments button wasn't getting disabled, because I was not using the right JavaScript ID to select it.

File:

• main/trunk/greenstone3/web/interfaces/default/js/user_comments.js (modified) (7 diffs)

main/trunk/greenstone3/web/interfaces/default/js/user_comments.js

@@ -254 +254 @@
     // until the metadata has been updated
     document.getElementById("usercommentSubmitButton").disabled = true;
-    var delCommentsButton = document.getElementById("delCommentsButton");
+    var delCommentsButton = document.getElementById("del-selected-comments-button");
     if(delCommentsButton != undefined) {// should be defined when in this function
         delCommentsButton.disabled = true;
@@ -272 +272 @@
     var failure = false;
 
-    // Need to have metapositions in descending order for remove_metadata_array to work
-    // Start deleting from end of metadata list, so we don't have to recalculate metapos each time
-    /*
+    // remove-metadata-array perl functions now ensure metapos array
+    // is sorted in descending order
     for (var i = 0; i < selectedComments.length; i++) {
         var metapos = selectedComments[i].getAttribute("data-metapos");
-        metadataPositions.unshift(metapos); // add metapos to start of array
-    }*/
-
+        metadataPositions.push(metapos);
+        //metadataPositions.unshift(metapos); // add metapos to start of array
+    }
+
+    /*
     for (var i = selectedComments.length - 1; i >= 0; i--) {
         var metapos = selectedComments[i].getAttribute("data-metapos");
         metadataPositions.push(metapos); // add next lowest metapos to end of array
     }
+    */
     }    
     
@@ -322 +324 @@
     // until the metadata has been updated
     document.getElementById("usercommentSubmitButton").disabled = true;
-    var delCommentsButton = document.getElementById("delCommentsButton");
+    var delCommentsButton = document.getElementById("del-selected-comments-button");
     if(delCommentsButton != undefined) {
     delCommentsButton.disabled = true;
@@ -366 +368 @@
     // until the metadata has been updated
     document.getElementById("usercommentSubmitButton").disabled = true;
-    var delCommentsButton = document.getElementById("delCommentsButton");
+    var delCommentsButton = document.getElementById("del-selected-comments-button");
     if(delCommentsButton != undefined) {// should be defined when in this function
         delCommentsButton.disabled = true;
@@ -497 +499 @@
     // that the removeMetada ajax operations have completed.
     document.getElementById("usercommentSubmitButton").disabled = false;
-    var delCommentsButton = document.getElementById("delCommentsButton");
+    var delCommentsButton = document.getElementById("del-selected-comments-button");
     if(delCommentsButton != undefined) {
     delCommentsButton.disabled = false;
@@ -575 +577 @@
     // until the metadata has been updated
     document.getElementById("usercommentSubmitButton").disabled = true;
-    var delCommentsButton = document.getElementById("delCommentsButton");
+    var delCommentsButton = document.getElementById("del-selected-comments-button");
     if(delCommentsButton != undefined) {
     delCommentsButton.disabled = true;
@@ -637 +639 @@
     // that the set-meta-array operation has completed.
     document.getElementById("usercommentSubmitButton").disabled = false;
-    var delCommentsButton = document.getElementById("delCommentsButton");
+    var delCommentsButton = document.getElementById("del-selected-comments-button");
     if(delCommentsButton != undefined) {
     delCommentsButton.disabled = false;