svn commit: r641750 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/WEB-INF/controller.xml webapp/catalog/feature/FeatureForms.xml widget/catalog/FeatureScreens.xml

[hansbak-2]

Author: hansbak
Date: Thu Mar 27 02:00:55 2008
New Revision: 641750

URL: http://svn.apache.org/viewvc?rev=641750&view=rev
Log:
add a search function to the featuretype and make the list look like the standard lists

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
    ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=641750&r1=641749&r2=641750&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Mar 27 02:00:55 2008
@@ -4832,6 +4832,9 @@
         <value xml:lang="it">Lista Prodotti Attributi Caratteristiche</value>
         <value xml:lang="th">List Product Feature Appl Attrs</value>
     </property>
+    <property key="PageTitleListProductFeatureTypes">
+        <value xml:lang="en">List Product Feature Types</value>
+    </property>
     <property key="PageTitleListProductStoreFinAccountSettings">
         <value xml:lang="en">List Product Store Financial Account Settings</value>
         <value xml:lang="it">Lista Negozio Configurazione Conti Finanziari</value>
@@ -14740,6 +14743,9 @@
     </property>
     <property key="ProductSearchFeatureCategory">
         <value xml:lang="en">Search feature category</value>
+    </property>
+    <property key="ProductSearchFeatureType">
+        <value xml:lang="en">Search feature type</value>
     </property>
     <property key="ProductSRCH">
         <value xml:lang="en">SRCH</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=641750&r1=641749&r2=641750&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu Mar 27 02:00:55 2008
@@ -1163,7 +1163,7 @@
     <request-map uri="updateProductFeatureType">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="updateProductFeatureType"/>
-        <response name="success" type="view" value="EditFeatureTypes"/>
+        <response name="success" type="view" value="EditFeatureType"/>
         <response name="error" type="view" value="EditFeatureType"/>
     </request-map>
     <request-map uri="removeProductFeatureType">

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?rev=641750&r1=641749&r2=641750&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Thu Mar 27 02:00:55 2008
@@ -105,15 +105,30 @@
                 description="${uiLabelMap.CommonDelete}"/>
         </field>
     </form>
-
-    <form name="ListFeatureTypes" list-name="featureTypes" target="" title="" type="list" paginate-target="EditFeatureTypes"
+    <form name="FindFeatureType" type="single" target="EditFeatureTypes"
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="productFeatureTypeId"><text-find size="25" default-option="contains"></text-find></field>
+        <field name="description"><text-find size="25" default-option="contains"></text-find></field>
+        <field name="searchButton" widget-style="smallSubmit"><submit/></field>
+    </form>
+    <form name="ListFeatureTypes" list-name="listIt" target="" title="" type="list" paginate-target="EditFeatureTypes"
         odd-row-style="alternate-row" default-table-style="basic-table">
-        <auto-fields-entity entity-name="ProductFeatureType" default-field-type="display"/>
-        <field name="productFeatureTypeId"><hidden/></field>
-        <field name="parentTypeId"><hidden/></field>
-        <field name="hasTable"><hidden/></field>
-        <field name="editFeatureType" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink target="EditFeatureType?productFeatureTypeId=${productFeatureTypeId}" description="${uiLabelMap.CommonEdit}"/>
+        <actions>
+            <set field="parameters.noConditionFind" value="Y"/>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="ProductFeatureType"/>
+                <field-map field-name="orderBy" value="productFeatureTypeId"/>
+            </service>
+        </actions>      
+        <field name="productFeatureTypeId" widget-style="buttontext">
+            <hyperlink target="EditFeatureType?productFeatureTypeId=${productFeatureTypeId}" description="${productFeatureTypeId}"/>            
+        </field>
+        <field name="description"><display/></field>
+        <field name="parentTypeId">
+            <display-entity entity-name="ProductFeatureType" description="${description}" key-field-name="productFeatureTypeId">
+                <sub-hyperlink target="EditFeatureType?productFeatureTypeId=${parentTypeId}" description="${parentTypeId}"/>
+            </display-entity>
         </field>
         <field name="removeFeatureType" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
             <hyperlink target="removeProductFeatureType?productFeatureTypeId=${productFeatureTypeId}" description="${uiLabelMap.CommonDelete}"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=641750&r1=641749&r2=641750&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Thu Mar 27 02:00:55 2008
@@ -98,20 +98,25 @@
                 <set field="titleProperty" value="PageTitleEditFeatureTypes"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="tabButtonItem" value="FeatureType"/>
-    
-                <entity-condition entity-name="ProductFeatureType" list-name="featureTypes">
-                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFeatureDecorator">
                     <decorator-section name="body">
-                        <container>
-                            <link target="EditFeatureType" text="${uiLabelMap.ProductNewFeatureType}" style="buttontext"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="h3">
+                                    <label text="${uiLabelMap.ProductSearchFeatureType}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <container><link target="EditFeatureType" text="${uiLabelMap.ProductNewFeatureType}" style="buttontext"/></container>
+                                <include-form name="FindFeatureType" location="component://product/webapp/catalog/feature/FeatureForms.xml"/>
+                            </container>
                         </container>
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditFeatureTypes}"/>
+                                    <label text="${uiLabelMap.PageTitleListProductFeatureTypes}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">