svn commit: r998618 - in /ofbiz/trunk/framework/webtools: webapp/webtools/WEB-INF/controller.xml widget/PortalAdmScreens.xml

[buscob]

Author: buscob
Date: Sun Sep 19 08:55:17 2010
New Revision: 998618

URL: http://svn.apache.org/viewvc?rev=998618&view=rev
Log:
Removed all AddPortletAdm stuff from webtools application (request, view-map and screen).
There is no need of such a duplication, since the AddPortlet features already available in the common component is now usable from every application thanks to the view-last/save-last-view pattern.

Modified:
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=998618&r1=998617&r2=998618&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sun Sep 19 08:55:17 2010
@@ -21,6 +21,7 @@ under the License.
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+    <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
     <include location="component://common/webcommon/WEB-INF/tempexpr-controller.xml"/>
     <include location="component://testtools/webapp/testtools/WEB-INF/controller.xml"/>
     <description>WebTools Site Configuration File</description>
@@ -566,10 +567,6 @@ under the License.
         <response name="success" type="view" value="EditPortalPage"/>
         <response name="error" type="view" value="EditPortalPage"/>
     </request-map>
-    <request-map uri="AddPortletAdm">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="AddPortletAdm"/>
-    </request-map>
     <request-map uri="updatePortalPageColumnAdm">
         <security https="true" auth="true"/>
         <event type="service" invoke="updatePortalPageColumn"/>
@@ -735,7 +732,6 @@ under the License.
     <view-map name="FindPortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#FindPortalPage"/>
     <view-map name="CreatePortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#CreatePortalPage"/>
     <view-map name="EditPortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#EditPortalPage"/>
-    <view-map name="AddPortletAdm" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#AddPortletAdm"/>
 
     <!-- Geo Management -->
     <view-map name="FindGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#FindGeo"/>

Modified: ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml?rev=998618&r1=998617&r2=998618&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml Sun Sep 19 08:55:17 2010
@@ -96,7 +96,6 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/myportal.js" global="true"/>
                 <set field="layoutSettings.styleSheets[+0]" value="/images/myportal.css" global="true"/>
                 <entity-one entity-name="PortalPage" value-field="portalPage"/>
-                <set field="Adm" value="Adm"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -165,27 +164,4 @@ under the License.
             </widgets>
         </section>
     </screen>
-
-    <screen name="AddPortletAdm">
-        <section>
-            <actions>
-                <set field="originalPortalPageId" from-field="parameters.originalPortalPageId"/>
-                <set field="portalPageId" from-field="parameters.portalPageId"/>
-                <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPortlets.groovy"/>
-                <entity-one value-field="portalPage" entity-name="PortalPage" use-cache="true"/>
-                <set field="Adm" value="Adm"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.CommonAddPortletToPage}: ${portalPage.portalPageName} [${portalPageId}]">
-                            <include-form name="PortletCategoryAndPortlet" location="component://common/widget/PortalPageForms.xml"/>
-                        </screenlet>
-                        <platform-specific><html><html-template location="component://common/webcommon/portal/listPortalPortlets.ftl"/></html></platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
 </screens>