Changeset 32473

Timestamp:

2018-09-18T15:52:17+12:00 (6 years ago)

Author:

kjdon

Message:

AllowDocumentEditing is true by default. Also, if we disable edit mode, then if we were currently in edit mode, then add docEdit=0 & ed=0 to url to take us out of editing.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (4 diffs)

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

@@ -24 +24 @@
   </xsl:variable>
 
-  <!-- does this collection have editing turned on -->
+  <!-- does this collection have editing turned on - turned on by default, can turn off in config file-->
   <xsl:variable name="isEditingTurnedOn">
-    <xsl:if test="/page/pageResponse/format[@type='display']/gsf:option[@name='AllowDocumentEditing']/@value='true'">1</xsl:if>
+    <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='AllowDocumentEditing']) or /page/pageResponse/format[@type='display']/gsf:option[@name='AllowDocumentEditing']/@value='true'">1</xsl:if>
   </xsl:variable>
   <!-- is editing available for the collection? eg is there an archives folder? -->
-  <xsl:variable name="isEditingAvailable">1</xsl:variable>
+  <xsl:variable name="isEditingAvailable">
+  <xsl:choose><xsl:when test="/page/pageResponse/collection/@no_archives">0</xsl:when><xsl:otherwise>1</xsl:otherwise></xsl:choose></xsl:variable>
   <!-- is a user logged in, and do they have editing rights for this collection? -->
   <xsl:variable name="userHasEditPermission">
@@ -386 +387 @@
     button.data("userMenu", menu);
 
+    // get the base url
+    var url = document.URL;
+    var hasQueryString = (url.indexOf("?") != -1);
+    var hashIndex = url.indexOf("#");
+    
+    var hashPart;
+    if(hashIndex != -1)
+    {
+    hashPart = url.substring(hashIndex);
+    url = url.substring(0, hashIndex);
+    }
+
     var settingsLink = $("&lt;a&gt;")
     .attr("href", gs.xsltParams.library_name + "/admin/AccountSettings?s1.username=</xsl:text><xsl:value-of select="/page/pageRequest/userInformation/@username"/><xsl:text disable-output-escaping="yes">");
@@ -406 +419 @@
     .click(function()
     {
-    var url = gs.xsltParams.library_name + "?a=g&amp;rt=ro&amp;s=ChangeUserEditMode&amp;s1.username=" + gs.userInformation.username + "&amp;s1.enabled=" + ((gs.userInformation.editEnabled == "true") ? "false" : "true");
-    $.ajax(url)
+    var c_url = gs.xsltParams.library_name + "?a=g&amp;rt=ro&amp;s=ChangeUserEditMode&amp;s1.username=" + gs.userInformation.username + "&amp;s1.enabled=" + ((gs.userInformation.editEnabled == "true") ? "false" : "true");
+    $.ajax(c_url)
     .success(function(response)
     {
-    location.reload(true);
+    //location.reload(true); // need to set docEdit=0 if we have just disabled editing
+    location.href= url + (hasQueryString ? "&amp;" : "?") + ((gs.userInformation.editEnabled == "true") ? "docEdit=0&amp;ed=0":"") + (hashPart ? hashPart : "");
     });
     });
@@ -425 +439 @@
     menu.append(editingLink);
       </xsl:text></xsl:if><xsl:text disable-output-escaping="yes">
-    var url = document.URL;
-    var hasQueryString = (url.indexOf("?") != -1);
-    var hashIndex = url.indexOf("#");
-    
-    var hashPart;
-    if(hashIndex != -1)
-    {
-    hashPart = url.substring(hashIndex);
-    url = url.substring(0, hashIndex);
-    }
     
     var logoutLink = $("&lt;a&gt;")