Changeset 33507 for main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

Timestamp:

2019-09-24T13:24:07+12:00 (5 years ago)

Author:

kjdon

Message:

moved canDoEditing variable code to top, so can be used everywhere in the file. added editingTurnedOn variable too. so just use these variables when testing for editing status

File:

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

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -25 +25 @@
     </xsl:variable>
 
+    <xsl:variable name="canDoEditing">
+      <xsl:if test="$isEditingAllowed = '1' and (/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true' and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor)))">true</xsl:if>
+    </xsl:variable>
+    <xsl:variable name="editingTurnedOn">
+      <xsl:if test="/page/pageRequest/paramList/param[@name='docEdit']/@value = '1'">true</xsl:if>
+    </xsl:variable>
+    
     <!-- optional cgi-params for links to document pages -->
     <xsl:variable name="opt-doc-link-args"></xsl:variable>
@@ -210 +217 @@
         
             <xsl:choose>
-              <xsl:when test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true' and /page/pageRequest/paramList/param[@name='docEdit']/@value = '1'  and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor))">
+              <xsl:when test="$canDoEditing = 'true' and $editingTurnedOn = 'true'"> 
                 <table id="meta{@nodeID}">
                     <xsl:attribute name="style">
@@ -400 +407 @@
         </xsl:if>
       </xsl:if>
-      <xsl:variable name="canDoEditing">
-        <xsl:if test="$isEditingTurnedOn = '1' and (/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true' and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor)))">true</xsl:if>
-      </xsl:variable>
       <xsl:if test="$canDoEditing = 'true'">
         <xsl:call-template name="javascriptForDocumentEditing"/>
@@ -457 +461 @@
             <!-- we want to do this stuff even if docType is simple or paged. Don't want to just set dt=hierarchy as that gives other unnecessary stuff-->
             <!-- This is the first choice from wrappedDocument template-->
-            <xsl:when test="$canDoEditing = 'true' and /page/pageRequest/paramList/param[@name='docEdit']/@value = '1'">
+            <xsl:when test="$canDoEditing = 'true' and $editingTurnedOn = 'true' ">
                 <div id="gs-document" style="width: 67%">
                   <xsl:call-template name="documentPre"/>