svn commit: r1076186 - in /ofbiz/trunk/framework/example/widget/example: CommonScreens.xml ExampleMenus.xml

[erwan]

Author: erwan
Date: Wed Mar  2 12:11:10 2011
New Revision: 1076186

URL: http://svn.apache.org/viewvc?rev=1076186&view=rev
Log:
Avoiding portalPageId in context when using screens so the right help is displayed when called

Modified:
    ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
    ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml

Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=1076186&r1=1076185&r2=1076186&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Wed Mar  2 12:11:10 2011
@@ -43,8 +43,6 @@ under the License.
                 <set field="applicationMenuName" value="ExampleAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://example/widget/example/ExampleMenus.xml" global="true"/>
                 <!--set field="appheaderTemplate" value="component://example/webapp/appheader.ftl"/-->
-                <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="EXAMPLE"/>
-                <script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/>
                 <set field="applicationTitle" value="${uiLabelMap.ExampleApplication}" global="true"/>
             </actions>
             <widgets>
@@ -308,12 +306,6 @@ under the License.
         <section>
             <actions>
                 <set field="tabButtonItem" value="main"/>
-                <set field="parameters.portalPageId" value="EXAMPLE"/>
-                <entity-one entity-name="PortalPage" value-field="portalPage"/>
-                <get-related value-field="portalPage" relation-name="PortalPageColumn" list="portalPageColumns"/>
-                <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
-                    <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
-                </entity-and>
             </actions>
             <widgets>
                  <include-screen name="FindExample" location="component://example/widget/example/ExampleScreens.xml"/>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml?rev=1076186&r1=1076185&r2=1076186&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml Wed Mar  2 12:11:10 2011
@@ -25,11 +25,10 @@ under the License.
         <menu-item name="ExampleFeature" title="${uiLabelMap.ExampleFeature}"><link target="FindExampleFeature"/></menu-item>
         <menu-item name="FormWidgetExamples" title="${uiLabelMap.ExampleFormWidgetExamples}"><link target="FormWidgetExamples"/></menu-item>
         <menu-item name="AjaxExample" title="${uiLabelMap.ExampleAjaxExamples}"><link target="authview/findExampleAjax"/></menu-item>
-        <menu-item name="portalPage" parent-portal-page-value="${parameters.parentPortalPageId}"/>
+        <menu-item name="portalPage" parent-portal-page-value="EXAMPLE"/>
         <menu-item name="Dashboard" title="${uiLabelMap.ExampleDashboard}" align-style="opposed">
             <link target="ManagePortalPages">
-                <parameter param-name="portalPageId" from-field="currentPortalPage.portalPageId"/>
-                <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
+                <parameter param-name="parentPortalPageId" value="EXAMPLE"/>
             </link>
         </menu-item>
         <menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}"><link target="ExampleGeoLocationPointSet1"/></menu-item>