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

[hansbak-2]

Author: hansbak
Date: Sun Oct 16 09:00:07 2011
New Revision: 1184785

URL: http://svn.apache.org/viewvc?rev=1184785&view=rev
Log:
enable the update of the feature category description and remove translation because it is demo data and would not allow update

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

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=1184785&r1=1184784&r2=1184785&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Sun Oct 16 09:00:07 2011
@@ -1519,7 +1519,8 @@
         <value xml:lang="zh">标准</value>
         <value xml:lang="zh_TW">標准</value>
     </property>
-    <property key="ProductFeatureCategory.description.1000">
+    <!-- this is not seed databut demo and should not be translated, otherwise it cannot be updated in the screens -->
+    <!-- property key="ProductFeatureCategory.description.1000">
         <value xml:lang="en">Hazmat Features</value>
         <value xml:lang="es">Características de Peligroso</value>
         <value xml:lang="fr">Substances dangeureuse</value>
@@ -1575,7 +1576,7 @@
         <value xml:lang="it">Caratteristiche widget</value>
         <value xml:lang="zh">预留名称特征</value>
         <value xml:lang="zh_TW">預留名稱特征</value>
-    </property>
+    </property-->
     <property key="ProductFeatureIactnType.description.FEATURE_IACTN_DEPEND">
         <value xml:lang="de">Abhängiges Merkmal</value>
         <value xml:lang="en">Dependent Feature</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=1184785&r1=1184784&r2=1184785&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sun Oct 16 09:00:07 2011
@@ -1104,8 +1104,7 @@ under the License.
     <request-map uri="UpdateFeatureCategory">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="updateProductFeatureCategory"/>
-        <response name="success" type="view" value="EditFeatureCategories"/>
-        <response name="error" type="view" value="EditFeatureCategories"/>
+        <response name="success" type="request-redirect-noparam" value="EditFeatureCategories"/>
     </request-map>
 
     <request-map uri="EditFeatureCategoryFeatures">

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml?rev=1184785&r1=1184784&r2=1184785&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureForms.xml Sun Oct 16 09:00:07 2011
@@ -292,12 +292,12 @@
 
     <form name="FindProductFeature" type="single" target="EditFeatureCategories"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="productFeatureCategoryId" title="${uiLabelMap.CommonId}"><text-find size="25"></text-find></field>
+        <field name="productFeatureCategoryId" title="${uiLabelMap.CommonId}"><text-find size="20" maxlength="255"></text-find></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text-find size="25"></text-find></field>
         <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit find"><submit/></field>
     </form>
 
-    <form name="ListProductFeature" type="list" list-name="listIt" paginate-target="EditFeatureCategories"
+    <form name="ListProductFeature" type="list" list-name="listIt" paginate-target="EditFeatureCategories" target="UpdateFeatureCategory"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
         <actions>
             <set field="parameters.noConditionFind" value="Y"/>
@@ -314,8 +314,8 @@
                 <parameter param-name="productFeatureCategoryId"/>
             </hyperlink>
         </field>
-        <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
-
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+ <field name="update" title="${uiLabelMap.CommonUpdate}"><submit/></field>
     </form>
 
     <form name="CreateProductFeature" type="single" target="CreateFeatureCategory">

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=1184785&r1=1184784&r2=1184785&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sun Oct 16 09:00:07 2011
@@ -215,8 +215,8 @@
                 <set field="titleProperty" value="PageTitleEditProductFeatureCategories"/>
                 <set field="headerItem" value="featurecats"/>
                 <set field="tabButtonItem" value="FeatureCategory"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX_1" type="Integer" default-value="0"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE_1" type="Integer" default-value="10"/>
 
                 <!--script location="component://product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategories.groovy"/-->
             </actions>