OFBiz › OFBiz - Commits

svn commit: r484960 - in /incubator/ofbiz/trunk/applications/content: config/ widget/ widget/cms/ widget/content/ widget/contentsetup/ widget/datasetup/ widget/layout/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jacopoc

svn commit: r484960 - in /incubator/ofbiz/trunk/applications/content: config/ widget/ widget/cms/ widget/content/ widget/contentsetup/ widget/datasetup/ widget/layout/

Author: jacopoc
Date: Sat Dec 9 02:04:29 2006
New Revision: 484960

URL: http://svn.apache.org/viewvc?view=rev&rev=484960
Log:
Fixed content permission errors: OFBIZ-526

Modified:
incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties
incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml
incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
incubator/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml

Modified: incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties?view=diff&rev=484960&r1=484959&r2=484960
==============================================================================
--- incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/content/config/ContentUiLabels.properties Sat Dec 9 02:04:29 2006
@@ -67,6 +67,7 @@
ContentIndexAll=Index All Content Under
ContentQueryLine=Enter query parameters
ContentViewPermissionError=You do not have permission to view this page. ("CONTENTMGR_VIEW" or "CONTENTMGR_ADMIN" needed)
+ContentUpdatePermissionError=You do not have permission to view this page. ("CONTENTMGR_UPDATE" or "CONTENTMGR_ADMIN" needed)
ContentTree=Tree
ContentLayout=Layout

Modified: incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml?view=diff&rev=484960&r1=484959&r2=484960
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml Sat Dec 9 02:04:29 2006
@@ -50,8 +50,18 @@
<widgets>
<decorator-screen name="mainContentDecorator">
<decorator-section name="body">
- <include-menu name="cms" location="component://content/webapp/content/cms/CMSMenus.xml" />
- <decorator-section-include name="body"/>
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+ </condition>
+ <widgets>
+ <include-menu name="cms" location="component://content/webapp/content/cms/CMSMenus.xml" />
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.ContentUpdatePermissionError}</label>
+ </fail-widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -66,22 +76,32 @@
<widgets>
<decorator-screen name="mainContentDecorator">
<decorator-section name="body">
- <include-menu name="content" location="component://content/widget/content/ContentMenus.xml"/>
- <container>
- <include-menu name="contentSub" location="component://content/widget/content/ContentMenus.xml"/>
- </container>
<section>
<condition>
- <not><if-empty field-name="currentValue.contentId"/></not>
+ <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<widgets>
- <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.contentName},${currentValue.description} [${currentValue.contentId}] ${uiLabelMap.${extraFunctionName}}"/>
+ <include-menu name="content" location="component://content/widget/content/ContentMenus.xml"/>
+ <container>
+ <include-menu name="contentSub" location="component://content/widget/content/ContentMenus.xml"/>
+ </container>
+ <section>
+ <condition>
+ <not><if-empty field-name="currentValue.contentId"/></not>
+ </condition>
+ <widgets>
+ <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.contentName},${currentValue.description} [${currentValue.contentId}] ${uiLabelMap.${extraFunctionName}}"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head1" text="${uiLabelMap.PageTitleAddContent}"/>
+ </fail-widgets>
+ </section>
+ <decorator-section-include name="body"/>
</widgets>
<fail-widgets>
- <label style="head1" text="${uiLabelMap.PageTitleAddContent}"/>
+ <label style="head3">${uiLabelMap.ContentUpdatePermissionError}</label>
</fail-widgets>
</section>
- <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -141,17 +161,27 @@
<decorator-section name="body">
<section>
<condition>
- <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<widgets>
- <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.dataResourceName} [${currentValue.dataResourceId}] ${uiLabelMap.${extraFunctionName}}"/>
+ <section>
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <widgets>
+ <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.dataResourceName} [${currentValue.dataResourceId}] ${uiLabelMap.${extraFunctionName}}"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head1" text="${uiLabelMap.${titleProperty}}"/>
+ </fail-widgets>
+ </section>
+ <include-menu name="dataresource" location="component://content/widget/content/DataResourceMenus.xml"/>
+ <decorator-section-include name="body"/>
</widgets>
<fail-widgets>
- <label style="head1" text="${uiLabelMap.${titleProperty}}"/>
+ <label style="head3">${uiLabelMap.ContentUpdatePermissionError}</label>
</fail-widgets>
</section>
- <include-menu name="dataresource" location="component://content/widget/content/DataResourceMenus.xml"/>
- <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -183,8 +213,18 @@
<widgets>
<decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="contentsetup" location="component://content/webapp/content/contentsetup/ContentSetupMenus.xml"/>
- <decorator-section-include name="body"/>
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+ </condition>
+ <widgets>
+ <include-menu name="contentsetup" location="component://content/webapp/content/contentsetup/ContentSetupMenus.xml"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.ContentUpdatePermissionError}</label>
+ </fail-widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -199,8 +239,18 @@
<widgets>
<decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="dataresourcesetup" location="component://content/webapp/content/datasetup/DataResourceSetupMenus.xml"/>
- <decorator-section-include name="body"/>
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+ </condition>
+ <widgets>
+ <include-menu name="dataresourcesetup" location="component://content/webapp/content/datasetup/DataResourceSetupMenus.xml"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.ContentUpdatePermissionError}</label>
+ </fail-widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -215,8 +265,18 @@
<widgets>
<decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-menu name="layout" location="component://content/webapp/content/layout/LayoutMenus.xml"/>
- <decorator-section-include name="body"/>
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+ </condition>
+ <widgets>
+ <include-menu name="layout" location="component://content/webapp/content/layout/LayoutMenus.xml"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.ContentUpdatePermissionError}</label>
+ </fail-widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>

Modified: incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?view=diff&rev=484960&r1=484959&r2=484960
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Sat Dec 9 02:04:29 2006
@@ -20,9 +20,6 @@

<screen name="CMSContentFind">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="title" value="CMS Content Find Page"/>
<set field="entityName" value="ContentAssocDataResourceViewFrom"/>
@@ -46,9 +43,6 @@

<screen name="CMSContentEdit">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="CMS Content Edit Page"/>
@@ -83,9 +77,6 @@

<screen name="CMSContentAdd">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="CREATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="CMS Content Edit Page"/>
@@ -103,9 +94,6 @@

<screen name="EditAddContent">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="title" value="CMS Content Edit Page"/>
<set field="entityOperation" value="_UPDATE"/>
@@ -145,9 +133,6 @@

<screen name="EditAddSubContent">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="title" value="CMS Content Edit Page"/>
<set field="entityOperation" value="_UPDATE"/>
@@ -180,9 +165,6 @@

<screen name="AdminSearch">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<script location="component://content/widget/cms/advancedsearchprep.bsh"/>
@@ -209,9 +191,6 @@

<screen name="AdminIndex">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="CMS Search Page"/>
@@ -231,9 +210,6 @@

<screen name="CMSSites">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="CMS Search Page"/>
@@ -261,9 +237,6 @@

<screen name="addSubSite">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="Add SubSite"/>
@@ -284,9 +257,6 @@
</screen>
<screen name="TestPermission">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="ADMIN"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="title" value="Test Permission"/>

Modified: incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?view=diff&rev=484960&r1=484959&r2=484960
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sat Dec 9 02:04:29 2006
@@ -21,7 +21,7 @@
<screen name="FindContent">
<section>
<condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+ <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
</condition>
<actions>
<set field="headerItem" value="Content"/>
@@ -42,13 +42,17 @@
</decorator-section>
</decorator-screen>
</widgets>
+ <fail-widgets>
+ <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <label style="head3">${uiLabelMap.ContentUpdatePermissionError}</label>
+ </decorator-section>
+ </decorator-screen>
+ </fail-widgets>
</section>
</screen>
<screen name="EditContent">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContent"/>
<set field="tabButtonItem" value="content"/>
@@ -66,9 +70,6 @@
</screen>

<screen name="EditContentAssoc">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentAssoc"/>
<set field="currentContentMenuItemName" value="contentassoc" to-scope="user"/>
@@ -145,9 +143,6 @@

<screen name="EditContentRole">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="titleProperty" value="PageTitleEditContentRole"/>
@@ -173,9 +168,6 @@

<screen name="EditContentPurpose">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="titleProperty" value="PageTitleEditContentPurpose"/>
@@ -199,36 +191,30 @@

<screen name="EditContentAttribute">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
- <actions>
- <script location="component://content/widget/getMenuContext.bsh"/>
- <set field="titleProperty" value="PageTitleEditContentAttribute"/>
- <set field="tabButtonItem" value="attribute"/>
- <set field="contentId" from-field="parameters.contentId" />
- <entity-one entity-name="Content" value-name="currentValue">
- <field-map field-name="contentId" env-name="parameters.contentId"/>
- </entity-one>
- </actions>
- <widgets>
- <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-form name="ListContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
- <label style="head1" text="${uiLabelMap.PageTitleAddAttribute}"></label>
- <include-form name="AddContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
+ <actions>
+ <script location="component://content/widget/getMenuContext.bsh"/>
+ <set field="titleProperty" value="PageTitleEditContentAttribute"/>
+ <set field="tabButtonItem" value="attribute"/>
+ <set field="contentId" from-field="parameters.contentId" />
+ <entity-one entity-name="Content" value-name="currentValue">
+ <field-map field-name="contentId" env-name="parameters.contentId"/>
+ </entity-one>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="ListContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
+ <label style="head1" text="${uiLabelMap.PageTitleAddAttribute}"></label>
+ <include-form name="AddContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
</section>
</screen>

<screen name="EditContentMetaData">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
<set field="titleProperty" value="PageTitleEditContentMetadata"/>
@@ -252,9 +238,6 @@

<screen name="LookupContent">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
<set field="title" value="${uiLabelMap.PageTitleLookupContent}"/>

Modified: incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?view=diff&rev=484960&r1=484959&r2=484960
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sat Dec 9 02:04:29 2006
@@ -18,9 +18,6 @@
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
<screen name="FindDataResource">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="headerItem" value="DataResource"/>
<set field="titleProperty" value="PageTitleFindDataResource"/>
@@ -42,9 +39,6 @@
</screen>
<screen name="LookupDataResource">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
<set field="title" value="${uiLabelMap.PageTitleLookupDataResource}"/>
@@ -64,9 +58,6 @@

<screen name="EditDataResource">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResource"/>
<set field="headerItem" value="DataResource"/>
@@ -86,9 +77,6 @@

<screen name="UploadImage">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleUploadImageDataResource"/>
<set field="headerItem" value="DataResource"/>
@@ -126,9 +111,6 @@
</screen>

<screen name="AddDataResourceText">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleAddDataResourceText"/>
<set field="headerItem" value="DataResource"/>
@@ -163,9 +142,6 @@
</screen>
<screen name="AddDataResourceUrl">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleAddDataResourceUrl"/>
<set field="headerItem" value="DataResource"/>
@@ -183,9 +159,6 @@
</screen>
<screen name="AddDataResourceUpload">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleAddDataResourceUpload"/>
<set field="headerItem" value="DataResource"/>
@@ -202,9 +175,6 @@
</screen>
<screen name="EditDataResourceText">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResourceText"/>
<set field="headerItem" value="DataResource"/>
@@ -221,9 +191,6 @@
</screen>
<screen name="EditDataResourceUrl">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResourceUrl"/>
<set field="headerItem" value="DataResource"/>
@@ -240,9 +207,6 @@
</screen>
<screen name="EditDataResourceUpload">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResourceUpload"/>
<set field="headerItem" value="DataResource"/>
@@ -259,9 +223,6 @@
</screen>
<screen name="EditElectronicText">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditElectronicText"/>
<set field="headerItem" value="DataResource"/>
@@ -281,9 +242,6 @@
</screen>
<screen name="EditDataResourceAttribute">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResourceAttribute"/>
<set field="headerItem" value="DataResource"/>
@@ -305,9 +263,6 @@
</screen>
<screen name="EditDataResourceRole">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResourceRole"/>
<set field="headerItem" value="DataResource"/>
@@ -329,9 +284,6 @@
</screen>
<screen name="EditDataResourceProductFeatures">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResourceProductFeatures"/>
<set field="headerItem" value="DataResource"/>
@@ -353,9 +305,6 @@
</screen>
<screen name="EditHtmlText">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditHtmlText"/>
<set field="headerItem" value="DataResource"/>

Modified: incubator/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml?view=diff&rev=484960&r1=484959&r2=484960
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml Sat Dec 9 02:04:29 2006
@@ -40,9 +40,6 @@
-->
<screen name="EditContentType">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentType"/>
<set field="headerItem" value="ContentSetupMenu"/>
@@ -61,9 +58,6 @@

<screen name="EditContentTypeAttr">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentAttribute"/>
<set field="headerItem" value="ContentSetupMenu"/>
@@ -82,9 +76,6 @@

<screen name="EditContentAssocType">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentAssoc"/>
<set field="headerItem" value="ContentSetupMenu"/>
@@ -103,9 +94,6 @@

<screen name="EditContentPurposeType">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentPurpose"/>
<set field="headerItem" value="ContentSetupMenu"/>
@@ -124,9 +112,6 @@

<screen name="EditContentAssocPredicate">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentAssocPredicate"/>
<set field="headerItem" value="ContentSetupMenu"/>
@@ -145,9 +130,6 @@

<screen name="EditContentPurposeOperation">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentPurposeOperation"/>
<set field="headerItem" value="ContentSetupMenu"/>
@@ -166,9 +148,6 @@

<screen name="UserPermissions">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="ADMIN"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentUserPermissions"/>
<set field="headerItem" value="ContentSetupMenu"/>
@@ -191,9 +170,6 @@
</screen>
<screen name="EditContentOperation">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditContentOperation"/>
<set field="headerItem" value="ContentSetupMenu"/>

Modified: incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml?view=diff&rev=484960&r1=484959&r2=484960
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Sat Dec 9 02:04:29 2006
@@ -19,9 +19,6 @@
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
<screen name="EditDataResourceType">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResourceType"/>
<set field="headerItem" value="DataResourceSetupMenu"/>
@@ -39,9 +36,6 @@
</screen>
<screen name="EditCharacterSet">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditCharacterSet"/>
<set field="headerItem" value="DataResourceSetupMenu"/>
@@ -59,9 +53,6 @@
</screen>
<screen name="EditDataResourceTypeAttr">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditDataResourceTypeAttr"/>
<set field="headerItem" value="DataResourceSetupMenu"/>
@@ -79,9 +70,6 @@
</screen>
<screen name="EditFileExtension">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditFileExtension"/>
<set field="headerItem" value="DataResourceSetupMenu"/>
@@ -99,9 +87,6 @@
</screen>
<screen name="EditMetaDataPredicate">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditMetaDataPredicate"/>
<set field="headerItem" value="DataResourceSetupMenu"/>
@@ -119,9 +104,6 @@
</screen>
<screen name="EditMimeType">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditMimeType"/>
<set field="headerItem" value="DataResourceSetupMenu"/>
@@ -139,9 +121,6 @@
</screen>
<screen name="EditDataCategory">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditMimeType"/>
<set field="headerItem" value="DataResourceSetupMenu"/>

Modified: incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?view=diff&rev=484960&r1=484959&r2=484960
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Sat Dec 9 02:04:29 2006
@@ -19,9 +19,6 @@
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
<screen name="FindLayout">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="VIEW"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleFindLayout"/>
<set field="headerItem" value="Layout"/>
@@ -44,9 +41,6 @@
</screen>
<screen name="ListLayout">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="VIEW"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleListLayout"/>
<set field="headerItem" value="Layout"/>
@@ -71,9 +65,6 @@
</screen>
<screen name="EditLayout">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditLayout"/>
<set field="headerItem" value="Layout"/>
@@ -98,9 +89,6 @@
</screen>
<screen name="EditLayoutSubContent">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditLayout"/>
<set field="headerItem" value="Layout"/>
@@ -120,9 +108,6 @@
</screen>
<screen name="EditLayoutText">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditLayout"/>
<set field="headerItem" value="Layout"/>
@@ -144,9 +129,6 @@
</screen>
<screen name="EditLayoutHtml">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditLayout"/>
<set field="headerItem" value="Layout"/>
@@ -168,9 +150,6 @@
</screen>
<screen name="EditLayoutUrl">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditLayout"/>
<set field="headerItem" value="Layout"/>
@@ -192,9 +171,6 @@
</screen>
<screen name="EditLayoutImage">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditLayout"/>
<set field="headerItem" value="Layout"/>
@@ -216,9 +192,6 @@
</screen>
<screen name="AddLayout">
<section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="_UPDATE"/>
- </condition>
<actions>
<set field="titleProperty" value="PageTitleEditLayout"/>
<set field="headerItem" value="Layout"/>