svn commit: r1023344 - in /ofbiz/trunk/framework/webtools: data/WebtoolsSecurityData.xml webapp/webtools/main.ftl widget/Menus.xml

[buscob]

Author: buscob
Date: Sat Oct 16 18:22:43 2010
New Revision: 1023344

URL: http://svn.apache.org/viewvc?rev=1023344&view=rev
Log:
Replaced permission PORTALPAGE_MAINT with PORTALPAGE_ADMIN

Modified:
    ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
    ofbiz/trunk/framework/webtools/widget/Menus.xml

Modified: ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml?rev=1023344&r1=1023343&r2=1023344&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml (original)
+++ ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml Sat Oct 16 18:22:43 2010
@@ -58,11 +58,6 @@ under the License.
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PERIOD_MAINT"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="PERIOD_MAINT"/>
 
-    <!-- PortalPage Maintenance security -->
-    <SecurityPermission description="All Portal Page Maintenance pages." permissionId="PORTALPAGE_MAINT"/>
-    <SecurityGroupPermission groupId="FULLADMIN" permissionId="PORTALPAGE_MAINT"/>
-    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PORTALPAGE_MAINT"/>
-
     <!-- Enum & Status Maintenance security -->
     <SecurityPermission description="Use the Enum and Status Maintenance pages." permissionId="ENUM_STATUS_MAINT"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENUM_STATUS_MAINT"/>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=1023344&r1=1023343&r2=1023344&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Sat Oct 16 18:22:43 2010
@@ -95,7 +95,7 @@ under the License.
           <li><a href="<@ofbizUrl>viewdatafile</@ofbizUrl>">${uiLabelMap.WebtoolsWorkWithDataFiles}</a></li>
         </#if>
         <li><h3>${uiLabelMap.WebtoolsMiscSetupTools}</h3></li>
-        <#if security.hasPermission("PORTALPAGE_MAINT", session)>
+        <#if security.hasPermission("PORTALPAGE_ADMIN", session)>
           <li><a href="<@ofbizUrl>FindPortalPage</@ofbizUrl>">${uiLabelMap.WebtoolsAdminPortalPage}</a></li>
           <li><a href="<@ofbizUrl>FindGeo</@ofbizUrl>">${uiLabelMap.WebtoolsGeoManagement}</a></li>
         </#if>

Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=1023344&r1=1023343&r2=1023344&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Sat Oct 16 18:22:43 2010
@@ -49,7 +49,7 @@ under the License.
             <link target="FindGeo"/>
         </menu-item>        
         <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}">
-            <condition><if-has-permission permission="PORTALPAGE_MAINT"/></condition>
+            <condition><if-has-permission permission="PORTALPAGE_ADMIN"/></condition>
             <link target="FindPortalPage"/>
         </menu-item>
         <menu-item name="tests" title="Tests">