inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.3-BUG-FIX to HEAD

Browse Source 
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
This commit is contained in:
Kevin Roast
2010-10-18 20:18:05 +00:00
parent f48189bbba
commit 54dec52ac8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/web/jsp/content/document-details.jsp
View File

@@ -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>

6
source/web/jsp/spaces/space-details.jsp
View File

@@ -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>