OFBiz › OFBiz - Commits

svn commit: r1096290 - in /ofbiz/trunk/framework: common/webcommon/WEB-INF/ common/widget/ example/config/ example/data/ example/widget/example/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1096290 - in /ofbiz/trunk/framework: common/webcommon/WEB-INF/ common/widget/ example/config/ example/data/ example/widget/example/

jleroux@apache.org
Author: jleroux
Date: Sun Apr 24 09:35:28 2011
New Revision: 1096290

URL: http://svn.apache.org/viewvc?rev=1096290&view=rev
Log:
A patch from Nicolas Malin "Add LookupPortalPage on common components" https://issues.apache.org/jira/browse/OFBIZ-4260

To test :

    * apply patch
    * apply patch from OFBiz-4262
    * load seed
    * Go to example and add examplePortlet2 to an example pagePortal
    * Edit examplePortlet2

Modified:
    ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
    ofbiz/trunk/framework/common/widget/LookupForms.xml
    ofbiz/trunk/framework/common/widget/LookupScreens.xml
    ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
    ofbiz/trunk/framework/example/data/ExamplePortletData.xml
    ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml
    ofbiz/trunk/framework/example/widget/example/PortletScreens.xml

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1096290&r1=1096289&r2=1096290&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Sun Apr 24 09:35:28 2011
@@ -166,6 +166,7 @@ under the License.
         <security https="true" auth="false"/>
         <response name="success" type="view" value="editPortalPageColumnWidth" save-last-view="true"/>
     </request-map>
+    <request-map uri="LookupPortalPage"><security https="true" auth="true"/><response name="success" type="view" value="LookupPortalPage"/></request-map>
     <!-- View Mappings -->
     <view-map name="showPortalPage" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
     <view-map name="showPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortlet"/>
@@ -177,4 +178,5 @@ under the License.
     <view-map name="addPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#AddPortlet"/>
     <view-map name="editPortalPortletAttributes" type="screen" page="component://common/widget/PortalPageScreens.xml#EditPortalPortletAttributes"/>
     <view-map name="editPortalPageColumnWidth" type="screen" page="component://common/widget/PortalPageScreens.xml#EditPortalPageColumnWidth"/>
+    <view-map name="LookupPortalPage" type="screen" page="component://common/widget/LookupScreens.xml#LookupPortalPage"/>
 </site-conf>

Modified: ofbiz/trunk/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupForms.xml?rev=1096290&r1=1096289&r2=1096290&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupForms.xml Sun Apr 24 09:35:28 2011
@@ -92,4 +92,26 @@ under the License.
         <field name="disabledDateTime"><display/></field>
     </form>
 
+    <form name="LookupPortalPage" type="single" target="LookupPortalPage">
+        <auto-fields-entity entity-name="PortalPage" default-field-type="find"/>
+        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
+    </form>
+    
+    <form name="ListPortalPages" type="list" list-name="listIt" paginate-target="LookupPortalPage"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="orderBy" value="portalPageId"/>
+                <field-map field-name="entityName" value="PortalPage"/>
+                <field-map field-name="viewIndex" from-field="viewIndex"/>
+                <field-map field-name="viewSize" from-field="viewSize"/>
+            </service>
+        </actions>
+        <auto-fields-entity entity-name="PortalPage" default-field-type="display"/>
+        <field name="portalPageId" widget-style="smallSubmit">
+            <hyperlink also-hidden="false" target-type="plain" description="${portalPageId}" target="javascript:set_value('${portalPageId}')"/>
+        </field>
+    </form>
 </forms>

Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=1096290&r1=1096289&r2=1096290&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Sun Apr 24 09:35:28 2011
@@ -207,4 +207,22 @@ under the License.
             </widgets>
         </section>
     </screen>
+    
+    <screen name="LookupPortalPage">
+        <section>
+            <actions>
+                <set field="title" value="${uiLabelMap.CommonPortalPage}"/>
+            </actions>
+            <widgets>
+               <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                    <decorator-section name="search-options">
+                        <include-form name="LookupPortalPage" location="component://common/widget/LookupForms.xml"/>
+                    </decorator-section>
+                    <decorator-section name="search-results">
+                        <include-form name="ListPortalPages" location="component://common/widget/LookupForms.xml"/>
+                    </decorator-section>
+              </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleUiLabels.xml?rev=1096290&r1=1096289&r2=1096290&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleUiLabels.xml Sun Apr 24 09:35:28 2011
@@ -459,6 +459,14 @@
         <value xml:lang="th">ตัวอย่างรูปแบบ Widget</value>
         <value xml:lang="zh">表单挂件样例</value>
     </property>
+    <property key="ExamplePortletAttributNeedToBeDefineClickHere">
+        <value xml:lang="en">Portlet Attribut need to be define, click here to resolve it </value>
+        <value xml:lang="fr">Les attributs de la portlet doivent être definie. Cliquez ici pour résoudre le problème.</value>
+    </property>
+    <property key="ExamplePortletGoToConfiguredPortalPage">
+        <value xml:lang="en">Go to configured portal page -> </value>
+        <value xml:lang="fr">Allez à la page portail configurée -> </value>
+    </property>
     <property key="ExampleGroupField">
         <value xml:lang="en">Group</value>
         <value xml:lang="it">Gruppo</value>

Modified: ofbiz/trunk/framework/example/data/ExamplePortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/ExamplePortletData.xml?rev=1096290&r1=1096289&r2=1096290&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/data/ExamplePortletData.xml (original)
+++ ofbiz/trunk/framework/example/data/ExamplePortletData.xml Sun Apr 24 09:35:28 2011
@@ -25,6 +25,7 @@ under the License.
 
     <PortalPortlet portalPortletId="EXAMPLE_2" portletName="Example 2" description="Example portlet n. 2"
         screenName="ExamplePortlet2" screenLocation="component://example/widget/example/PortletScreens.xml"
+        editFormName="ExamplePortlet2Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml"
         screenshot="/images/opentravelsystem_logo.jpg"/>
 
     <PortalPortlet portalPortletId="EXAMPLE_3" portletName="Example 3" description="Example portlet n. 3"

Modified: ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml?rev=1096290&r1=1096289&r2=1096290&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml Sun Apr 24 09:35:28 2011
@@ -38,6 +38,16 @@ under the License.
         <field name="updateButton"><submit/></field>
     </form>
 
+    <form name="ExamplePortlet2Edit" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
+        <field name="nextPortalPageId">
+            <lookup target-form-name="LookupPortalPage"/>
+        </field>
+        <field name="nextParentPortalPageId">
+            <lookup target-form-name="LookupPortalPage"/>
+        </field>
+        <field name="updateButton"><submit/></field>
+    </form>
+    
     <form name="ExamplePortlet3Edit" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
         <field name="SpecificTitle">
             <text/>

Modified: ofbiz/trunk/framework/example/widget/example/PortletScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/PortletScreens.xml?rev=1096290&r1=1096289&r2=1096290&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/PortletScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/PortletScreens.xml Sun Apr 24 09:35:28 2011
@@ -47,10 +47,30 @@ under the License.
     <screen name="ExamplePortlet2">
         <section>
             <actions>
-                <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/>  
+                <set field="nextPortalPageId" from-field="nextPortalPageId" default-value=""/>
+                <set field="nextParentPortalPageId" from-field="nextParentPortalPageId" default-value="EXAMPLE"/>            
             </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.ExamplePortletSecond}">
+                    <section>
+                        <condition><not><if-empty field="nextPortalPageId"/></not></condition>
+                       <widgets>
+                           <link target="showPortalPage" text="${uiLabelMap.ExamplePortletGoToConfiguredPortalPage} : ${nextPortalPageId} ${uiLabelMap.CommonOf} ${nextParentPortalPageId}" >
+                               <parameter param-name="portalPageId" from-field="nextPortalPageId"/>
+                               <parameter param-name="parentPortalPageId" from-field="nextParentPortalPageId"/>
+                               <image src="${iconsLocation}/application_go.png"/>
+                           </link>
+                       </widgets>
+                       <fail-widgets>
+                           <link target="editPortalPortletAttributes" text="${uiLabelMap.ExamplePortletAttributNeedToBeDefineClickHere}" >
+                               <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+                               <parameter param-name="portalPortletId" value="EXAMPLE_2"/>
+                               <parameter param-name="portletSeqId" value="00001"/>
+                               <image src="${iconsLocation}/wrench_orange.png"/>
+                           </link>
+                       </fail-widgets>
+                    </section>
                 </screenlet>
             </widgets>
         </section>


Free forum by Nabble Edit this page