From 54dec52ac80c5a446d72e670ad776b34a87fe867 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Mon, 18 Oct 2010 20:18:05 +0000
Subject: [PATCH] Merged V3.3-BUG-FIX to HEAD    23206: Merged V3.3 to
 V3.3-BUG-FIX       23204: Fix for ALF-5196 - Document download link URL
 doesn't work on Share (NTLM SSO) if users haven't already logged in.      
 23203: Fix for ALF-1915 - Unable to edit properties with WriteProperties
 permission (but not Write permission)       23201: Fix for ALF-2104 - RSS
 feed URL cannot start with https.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23207 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/web/jsp/content/document-details.jsp | 8 ++++----
 source/web/jsp/spaces/space-details.jsp     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/web/jsp/content/document-details.jsp b/source/web/jsp/content/document-details.jsp
index 4a2e30e3a6..f49aee100b 100644
--- a/source/web/jsp/content/document-details.jsp
+++ b/source/web/jsp/content/document-details.jsp
@@ -35,7 +35,7 @@
 </f:verbatim>
 <h:panelGroup id="dashboard-panel-facets">
    <f:facet name="title">
-      <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write" id="evalChange">
+      <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="WriteProperties" id="evalChange">
          <r:actionInstanceEvaluator id="eval1" value="#{DialogManager.bean.document}" evaluatorClassName="org.alfresco.web.action.evaluator.UnlockedDocEvaluator">
             <a:actionLink id="actModify" value="#{msg.modify}" action="dialog:applyDocTemplate" showLink="false" image="/images/icons/preview.gif" style="padding-right:8px" />
             <a:actionLink id="actRemove" value="#{msg.remove}" actionListener="#{DialogManager.bean.removeTemplate}" showLink="false" image="/images/icons/delete.gif" />
@@ -49,7 +49,7 @@
       <table width=100% cellspacing=0 cellpadding=0 border=0>
          <tr>
             <td align=left></f:verbatim>
-               <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write" id="evalApply">
+               <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="WriteProperties" id="evalApply">
                   <r:actionInstanceEvaluator id="eval2" value="#{DialogManager.bean.document}" evaluatorClassName="org.alfresco.web.action.evaluator.UnlockedDocEvaluator">
                      <a:actionLink id="actDashboard" value="#{msg.apply_template}" rendered="#{!DialogManager.bean.hasCustomView}" action="dialog:applyDocTemplate" />
                   </r:actionInstanceEvaluator>
@@ -93,7 +93,7 @@
 
 <h:panelGroup id="props-panel-facets">
    <f:facet name="title">
-      <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write">
+      <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="WriteProperties">
          <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/edit_properties.gif" action="#{DialogManager.bean.editContentProperties}" />
       </r:permissionEvaluator>
    </f:facet>
@@ -159,7 +159,7 @@
 <%-- Multilingual properties --%>
 <h:panelGroup id="ml-props-panel-facets">
    <f:facet name="title">
-      <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write">
+      <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="WriteProperties">
          <a:actionLink id="titleLinkMl" value="#{msg.modify}" showLink="false" image="/images/icons/edit_properties.gif" action="dialog:editMlContainer" />
       </r:permissionEvaluator>
    </f:facet>
diff --git a/source/web/jsp/spaces/space-details.jsp b/source/web/jsp/spaces/space-details.jsp
index 7530265c48..494b3103e1 100644
--- a/source/web/jsp/spaces/space-details.jsp
+++ b/source/web/jsp/spaces/space-details.jsp
@@ -33,7 +33,7 @@
       <%-- wrapper comment used by the panel to add additional component facets --%> 
       <h:panelGroup id="dashboard-panel-facets">
          <f:facet name="title">
-            <r:permissionEvaluator value="#{DialogManager.bean.space}" allow="Write" id="evalChange">
+            <r:permissionEvaluator value="#{DialogManager.bean.space}" allow="WriteProperties" id="evalChange">
                <a:actionLink id="actModify" value="#{msg.modify}" action="dialog:applySpaceTemplate" showLink="false" image="/images/icons/preview.gif" style="padding-right:8px" />
                <a:actionLink id="actRemove" value="#{msg.remove}" actionListener="#{DialogManager.bean.removeTemplate}" showLink="false" image="/images/icons/delete.gif" />
             </r:permissionEvaluator>
@@ -45,7 +45,7 @@
          <table width=100% cellspacing=0 cellpadding=0 border=0>
             <tr>
                <td align=left></f:verbatim>
-               <r:permissionEvaluator value="#{DialogManager.bean.space}" allow="Write" id="evalApply">
+               <r:permissionEvaluator value="#{DialogManager.bean.space}" allow="WriteProperties" id="evalApply">
                   <a:actionLink id="actDashboard" value="#{msg.apply_template}" rendered="#{!DialogManager.bean.hasCustomView}" action="dialog:applySpaceTemplate" />
                </r:permissionEvaluator> 
                <f:verbatim></f:verbatim>
@@ -84,7 +84,7 @@
       <%-- wrapper comment used by the panel to add additional component facets --%> 
       <h:panelGroup id="props-panel-facets">
          <f:facet name="title">
-            <r:permissionEvaluator value="#{DialogManager.bean.space}" allow="Write">
+            <r:permissionEvaluator value="#{DialogManager.bean.space}" allow="WriteProperties">
                <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/edit_properties.gif" action="dialog:editSpace" />
             </r:permissionEvaluator>
          </f:facet>