Changeset 32801 for main/trunk

Timestamp:

2019-02-22T11:25:07+13:00 (5 years ago)

Author:

ak19

Message:

Fixed the marker bug that it can be dragged when there is no user logged in.

File:

• main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js

@@ -358 +358 @@
             var callbackFunction = function(){console.log("Completed saving metadata changes. You must rebuild the collection for the changes to take effect.");};
     
+            // set 5th parameter, metapos (metadata position) or 7th param prevMetaValue (previous metadata value) to non-null if you want metamode=override to work
+            // if neither of these 2 are set, then metamode is changed to 'accumulate' instead.
             gs.functions.setArchivesMetadata(collection, site_name, nodeID, "Latitude", null, lat, null, "override", function(){callbackFunction();});
             gs.functions.setArchivesMetadata(collection, site_name, nodeID, "Longitude", null, lng, null, "override", function(){callbackFunction();});
@@ -397 +399 @@
     
     var docEdit = (("docEdit" in gs.cgiParams) && (gs.cgiParams['docEdit']));
-    var draggable_val = (docEdit) ? true : false;
+    //var draggable_val = (docEdit) ? true : false;
+    
+    // When user logs out, the very first page they're returned to has logout set
+    // If the user logged out when leaving docEdit on, then the very first page has docEdit=1 AND logout.
+    // In that case, don't allow editing. Subsequent pages in logged out mode have neither logout nor docEdit=1 set.
+    var loggedOutVar = ("logout" in gs.cgiParams);
+    
+    // Don't allow dragging if either 1. docEdit not on OR 2. logout is in the cgiParams
+    var draggable_val = (!docEdit || loggedOutVar) ? false : true;
+    
+    console.log(gs.cgiParams);
     
     var marker