svn commit: r684396 - in /ofbiz/trunk/applications/product: webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy webapp/catalog/config/ConfigForms.xml webapp/catalog/config/FindProductConfigItems.ftl widget/catalog/ConfigScreens.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r684396 - in /ofbiz/trunk/applications/product: webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy webapp/catalog/config/ConfigForms.xml webapp/catalog/config/FindProductConfigItems.ftl widget/catalog/ConfigScreens.xml

lektran
Author: lektran
Date: Sat Aug  9 19:09:30 2008
New Revision: 684396

URL: http://svn.apache.org/viewvc?rev=684396&view=rev
Log:
Converted the FindProductConfigItems screen to use a form widget

Removed:
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy
    ofbiz/trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl
Modified:
    ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
    ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=684396&r1=684395&r2=684396&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Sat Aug  9 19:09:30 2008
@@ -20,6 +20,21 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+    <form name="FindProductConfigItems" type="list" list-name="productConfigItems"
+        default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems">
+        <row-actions>
+            <set field="typeDescription" value="${bsh: return &quot;SINGLE&quot;.equals(configItemTypeId) ? uiLabelMap.get(&quot;ProductSingleChoice&quot;) : uiLabelMap.get(&quot;ProductMultiChoice&quot;)}"/>
+        </row-actions>
+        <field name="configItemId" title="${uiLabelMap.CommonId}"><display/></field>
+        <field name="configItemName" title="${uiLabelMap.CommonName}"><display/></field>
+        <field name="typeDescription" title="${uiLabelMap.CommonType}">
+            <display description="${typeDescription}"/>
+        </field>
+        <field name="description"><display/></field>
+        <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+            <hyperlink target="EditProductConfigItem?configItemId=${configItemId}" description="${uiLabelMap.CommonEdit}"/>
+        </field>
+    </form>
     <form name="EditProductConfigItem" type="single" target="updateProductConfigItem" title="" default-map-name="configItem"
         header-row-style="header-row" default-table-style="basic-table">
         

Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=684396&r1=684395&r2=684396&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sat Aug  9 19:09:30 2008
@@ -68,14 +68,28 @@
                 <set field="titleProperty" value="PageTitleFindConfigItems"/>
                 <set field="headerItem" value="configs"/>
                 
-                <script location="component://product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.groovy"/>
+                <entity-condition list-name="productConfigItems" entity-name="ProductConfigItem">
+                    <order-by field-name="configItemId"/>
+                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonConfigDecorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/catalog/config/FindProductConfigItems.ftl"/></html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="h3">
+                                    <label text="${uiLabelMap.PageTitleFindConfigItems}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <container><link target="EditProductConfigItem" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
+                                        <include-form location="component://product/webapp/catalog/config/ConfigForms.xml" name="FindProductConfigItems"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>