svn commit: r1609885 - in /ofbiz/trunk/applications/cont
Locked
svn commit: r1609885 - in /ofbiz/trunk/applications/cont
 
|
Author: jleroux
Date: Sat Jul 12 07:13:49 2014 New Revision: 1609885 URL: http://svn.apache.org/r1609885 Log: A patch from Pierre Smits for "User with update permission can't access screens in content application" https://issues.apache.org/jira/browse/OFBIZ-5676 When a user has security permission 'CONTENTMGR_UPDATE' he should be able to access various screens in the content application, but he can't. This applies to screens associated to menu-items: Content DataSource Content Setup DataResource Setup Template CMS Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=1609885&r1=1609884&r2=1609885&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sat Jul 12 07:13:49 2014 @@ -56,7 +56,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="cms" location="component://content/widget/cms/CMSMenus.xml"/> @@ -66,7 +66,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <decorator-section-include name="body"/> @@ -91,7 +91,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="content" location="component://content/widget/content/ContentMenus.xml"/> @@ -101,7 +101,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <container> @@ -142,7 +142,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="contentTopMenu" location="component://content/widget/content/ContentMenus.xml"/> @@ -152,7 +152,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <container style="no-clear"> @@ -181,7 +181,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="dataresourceTopMenu" location="component://content/widget/content/DataResourceMenus.xml"/> @@ -191,7 +191,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <section> @@ -246,7 +246,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="contentsetup" location="component://content/widget/contentsetup/ContentSetupMenus.xml"/> @@ -256,7 +256,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <decorator-section-include name="body"/> @@ -281,7 +281,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="dataresourcesetup" location="component://content/widget/datasetup/DataResourceSetupMenus.xml"/> @@ -291,7 +291,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <decorator-section-include name="body"/> @@ -361,7 +361,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="layout" location="component://content/widget/layout/LayoutMenus.xml"/> @@ -371,7 +371,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <decorator-section-include name="body"/> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=1609885&r1=1609884&r2=1609885&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sat Jul 12 07:13:49 2014 @@ -21,7 +21,7 @@ under the License. <screen name="ListContentApproval"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="rootContentId" from-field="parameters.rootContentId" default-value="${parameters.contentId}"/> @@ -85,7 +85,7 @@ under the License. <screen name="ListWaitingContentApproval"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/> @@ -119,7 +119,7 @@ under the License. <screen name="EditContentApproval"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="menuName" value="tree"/> @@ -150,7 +150,7 @@ under the License. <screen name="ListContentRevisions"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -186,7 +186,7 @@ under the License. <screen name="EditContentRevision"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/> @@ -215,7 +215,7 @@ under the License. <screen name="ListContentRevisionItem"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -247,7 +247,7 @@ under the License. <screen name="EditContentRevisionItem"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -319,7 +319,7 @@ under the License. <screen name="ListCompDoc"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="menuName" value="empty"/> @@ -360,7 +360,7 @@ under the License. <screen name="ViewInstances"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -471,7 +471,7 @@ under the License. <screen name="EditChildCompDoc"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set field="menuName" value="subtree"/> @@ -848,7 +848,7 @@ under the License. <screen name="AddRootCompDocInstance"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -881,7 +881,7 @@ under the License. <screen name="AddRootCompDocTemplate"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set field="menuName" value="tree"/> @@ -901,7 +901,7 @@ under the License. <screen name="AddChildCompDocInstance"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set field="menuName" value="tree"/> @@ -937,7 +937,7 @@ under the License. <screen name="AddChildCompDocTemplate"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set field="menuName" value="tree"/> @@ -964,7 +964,7 @@ under the License. <screen name="ViewCompDocTemplateTree"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -1002,7 +1002,7 @@ under the License. <screen name="ViewCompDocInstanceTree"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> @@ -1212,7 +1212,7 @@ under the License. <screen name="ListContentRevisionItemApproval"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="menuName" value="empty"/> @@ -1243,7 +1243,7 @@ under the License. <screen name="EditCompDocContentRole"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="menuName" value="tree"/> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=1609885&r1=1609884&r2=1609885&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sat Jul 12 07:13:49 2014 @@ -51,7 +51,7 @@ under the License. <screen name="findDataResourceSearchResults"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |