Changeset 25564

Timestamp:

2012-05-10T14:33:37+12:00 (12 years ago)

Author:

sjm84

Message:

This page will now display an "Accessed Denied" message when a non-admin/collection-editor

Location:

main/trunk/greenstone3/web

Files:

• WEB-INF/classes/interface_default.properties (modified) (1 diff)
• interfaces/oran/transform/pages/documentbasket.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/WEB-INF/classes/interface_default.properties

@@ -344 +344 @@
 ###################
 db.doc_basket=Document basket
-db.access_denied=Accessed Denied
+db.access_denied=Access Denied
+db.no_collection_building=You cannot use this feature of Greenstone as you do not have collection building enabled
 
 #############################

main/trunk/greenstone3/web/interfaces/oran/transform/pages/documentbasket.xsl

@@ -23 +23 @@
         <!-- Make sure the user is allowed to use this functionality -->
         <xsl:choose>
-            <xsl:when test="/page/pageRequest/userInformation 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="util:getGlobalProperty('disable.collection.building') = 'false' and /page/pageRequest/userInformation 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))">
                 <script type="text/javascript" src="interfaces/{$interface_name}/js/documentmaker_scripts.js"><xsl:text> </xsl:text></script>
                 <script type="text/javascript" src="interfaces/{$interface_name}/js/documentmaker_scripts_dd.js"><xsl:text> </xsl:text></script>
@@ -40 +40 @@
             </xsl:when>
             <xsl:otherwise>
-                <div><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'db.doc_basket')"/></div>
+                <div>
+                    <xsl:choose>
+                        <xsl:when test="util:getGlobalProperty('disable.collection.building') = 'true'">
+                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'db.no_collection_building')"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'db.access_denied')"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </div>
             </xsl:otherwise>
         </xsl:choose>