svn commit: r645198 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: hansbak
Date: Sat Apr 5 21:19:51 2008 New Revision: 645198 URL: http://svn.apache.org/viewvc?rev=645198&view=rev Log: improve the feature interaction screens Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.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=645198&r1=645197&r2=645198&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Apr 5 21:19:51 2008 @@ -2476,6 +2476,9 @@ <value xml:lang="th">รหัสลัà¸à¸©à¸à¸°à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">产åç¹å¾æ è¯</value> </property> + <property key="FormFieldTitle_productFeatureIactnTypeId"> + <value xml:lang="en">Interaction Type</value> + </property> <property key="FormFieldTitle_productFeatureTypeId"> <value xml:lang="en">Product Feature Type Id</value> <value xml:lang="fr">Réf. de type de caractéristique d'article</value> @@ -3607,6 +3610,9 @@ <value xml:lang="it">Aggiungi Gruppo Stabilimento Arrivo</value> <value xml:lang="th">Add Facility Group Rollup</value> </property> + <property key="PageTitleAddFeatureInterAction"> + <value xml:lang="en">Add Feature InterAction</value> + </property> <property key="PageTitleAddFeaturePrice"> <value xml:lang="en">Add Feature Price</value> </property> @@ -4098,9 +4104,6 @@ <property key="PageTitleEditProductFeatureInteractions"> <value xml:lang="en">Edit Product Feature Interactions</value> </property> - <property key="PageTitleAddFeatureInterAction"> - <value xml:lang="en">Add Feature InterAction</value> - </property> <property key="PageTitleEditFeatureInterActions"> <value xml:lang="en">Edit Feature InterActions</value> </property> @@ -4852,6 +4855,9 @@ <value xml:lang="en">List Product Feature Appl Attrs</value> <value xml:lang="it">Lista Prodotti Attributi Caratteristiche</value> <value xml:lang="th">List Product Feature Appl Attrs</value> + </property> + <property key="PageTitleListFeatureInteractions"> + <value xml:lang="en">List Product Feature Interactions</value> </property> <property key="PageTitleListProductFeatureTypes"> <value xml:lang="en">List Product Feature Types</value> 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=645198&r1=645197&r2=645198&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Sat Apr 5 21:19:51 2008 @@ -188,6 +188,7 @@ <field name="productFeatureId"> <drop-down allow-empty="true"> <entity-options description="${description} [${productFeatureId}]" entity-name="ProductFeature"> + <entity-order-by field-name="productFeatureTypeId"/> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -195,6 +196,7 @@ <field name="productFeatureIdTo"> <drop-down allow-empty="true"> <entity-options description="${description} [${productFeatureId}]" entity-name="ProductFeature" key-field-name="productFeatureId"> + <entity-order-by field-name="productFeatureTypeId"/> <entity-order-by field-name="description"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=645198&r1=645197&r2=645198&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Sat Apr 5 21:19:51 2008 @@ -1229,6 +1229,7 @@ </form> <form name="ListFeatureInteractions" list-name="featureInteractions" type="list" odd-row-style="alternate-row" default-table-style="basic-table"> + <field name="productId"><hidden/></field> <field name="productFeatureId"> <display-entity entity-name="ProductFeature" description="${description}"> <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureId}" description="[${productFeatureId}]"/> @@ -1247,11 +1248,12 @@ </form> <form name="AddFeatureInteraction" type="single" target="AddProductFeatureIactn" title="" default-map-name="productFeatureIactn" header-row-style="header-row" default-table-style="basic-table"> - <field name="productId"><hidden/></field> + <field name="productId"><hidden value="${parameters.productId}"/></field> <field name="productFeatureId" position="1"> <drop-down allow-empty="true"> <entity-options description="${description} [${productFeatureId}]" entity-name="ProductFeatureAndAppl"> <entity-constraint name="productId" env-name="parameters.productId"/> + <entity-order-by field-name="productFeatureTypeId"/> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1260,6 +1262,7 @@ <drop-down allow-empty="true"> <entity-options description="${description} [${productFeatureId}]" entity-name="ProductFeatureAndAppl" key-field-name="productFeatureId"> <entity-constraint name="productId" env-name="parameters.productId"/> + <entity-order-by field-name="productFeatureTypeId"/> <entity-order-by field-name="description"/> </entity-options> </drop-down> Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=645198&r1=645197&r2=645198&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sat Apr 5 21:19:51 2008 @@ -232,14 +232,14 @@ </container> </container> <container style="screenlet-body"> - <container><link target="EditFeatureInterActions" text="${uiLabelMap.ProductNewFeatureInterAction}" style="buttontext"/></container> + <container><link target="EditFeatureInterAction" text="${uiLabelMap.PageTitleAddFeatureInterAction}" style="buttontext"/></container> <include-form name="FindFeatureInterAction" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> </container> </container> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.PageTitleAddFeatureInterAction}"/> + <label text="${uiLabelMap.PageTitleListFeatureInteractions}"/> </container> </container> <container style="screenlet-body"> @@ -273,7 +273,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.PageTitleEditFeatureInterAction}"/> + <label text="${uiLabelMap.PageTitleAddFeatureInterAction}"/> </container> </container> <container style="screenlet-body"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |