svn commit: r642949 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: hansbak
Date: Mon Mar 31 03:13:05 2008 New Revision: 642949 URL: http://svn.apache.org/viewvc?rev=642949&view=rev Log: add feature interactions to a product Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/entitydef/entitymodel.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=642949&r1=642948&r2=642949&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon Mar 31 03:13:05 2008 @@ -4082,7 +4082,16 @@ <value xml:lang="ru">ÐзмениÑÑ ÐºÐ°ÑегоÑии оÑобенноÑÑей</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> <value xml:lang="zh">ç¼è¾ç¹å¾ç±»å</value> - </property> + </property> + <property key="AddFeatureInteraction"> + <value xml:lang="en">Add Feature Interaction</value> + </property> + <property key="ListFeatureInteractions"> + <value xml:lang="en">List Feature Interactions</value> + </property> + <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> @@ -11466,6 +11475,9 @@ <value xml:lang="ru">ÐовÑй подпиÑной ÑеÑÑÑÑ</value> <value xml:lang="th">à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ°å»ºè®¢é èµæº</value> + </property> + <property key="ProductNewVirtualVariantMethod"> + <value xml:lang="en">New Method</value> </property> <property key="ProductNewVirtualProduct"> <value xml:lang="en">New Virtual Product</value> Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=642949&r1=642948&r2=642949&view=diff ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Mar 31 03:13:05 2008 @@ -2387,6 +2387,7 @@ <field name="includeInPromotions" type="indicator"></field> <field name="isVirtual" type="indicator"></field> <field name="isVariant" type="indicator"></field> + <field name="newVirtualVariantMethod" type="indicator"><description>If this field is set to 'Y', the new feature variant selection method will be used, other values will use the old method</description></field> <field name="originGeoId" type="id"></field> <field name="requirementMethodEnumId" type="id"></field> <field name="billOfMaterialLevel" type="numeric"></field> 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=642949&r1=642948&r2=642949&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Mar 31 03:13:05 2008 @@ -1174,6 +1174,18 @@ <response name="success" type="request-redirect-noparam" value="EditFeatureInterActions"/> <response name="error" type="view" value="EditFeatureInterAction"/> </request-map> + <request-map uri="AddProductFeatureIactn"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="createProductFeatureIactn"/> + <response name="success" type="view" value="EditProductFeatures"/> + <response name="error" type="view" value="EditProductFeatures"/> + </request-map> + <request-map uri="removeFeatureIactn"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="removeProductFeatureIactn"/> + <response name="success" type="view" value="EditProductFeatures"/> + <response name="error" type="view" value="EditProductFeatures"/> + </request-map> <request-map uri="createProductFeatureType"> <security https="true" auth="true"/> <event type="service" path="" invoke="createProductFeatureType"/> 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=642949&r1=642948&r2=642949&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Mon Mar 31 03:13:05 2008 @@ -41,6 +41,9 @@ <field position="2" name="isVariant" title="${uiLabelMap.ProductVariantProduct}"> <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down> </field> + <field position="3" name="newVirtualVariantMethod" title="${uiLabelMap.ProductNewVirtualVariantMethod}"> + <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down> + </field> <field name="productTypeId" title="${uiLabelMap.ProductProductType}"> <drop-down no-current-selected-key="FINISHED_GOOD"> <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] --> @@ -1219,7 +1222,50 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - + <form name="ListFeatureInteractions" list-name="featureInteractions" type="list" + odd-row-style="alternate-row" default-table-style="basic-table"> + <field name="productFeatureId"> + <display-entity entity-name="ProductFeature" description="${description}"> + <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureId}" description="[${productFeatureId}]"/> + </display-entity> + </field> + <field name="productFeatureIdTo"> + <display-entity entity-name="ProductFeature" description="${description}" key-field-name="productFeatureId"> + <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureIdTo}" description="[${productFeatureIdTo}]"/> + </display-entity> + </field> + <field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field> + + <field name="removeFeatureInterAction" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> + <hyperlink target="removeFeatureIactn?productFeatureId=${productFeatureId}&productFeatureIdTo=${productFeatureIdTo}&productId=${productId}" description="${uiLabelMap.CommonDelete}"/> + </field> + </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="productFeatureId" position="1"> + <drop-down allow-empty="true"> + <entity-options description="${description} [${productFeatureId}]" entity-name="ProductFeature"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="productFeatureIdTo" position="2"> + <drop-down allow-empty="true"> + <entity-options description="${description} [${productFeatureId}]" entity-name="ProductFeature" key-field-name="productFeatureId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="productFeatureIactnTypeId"> + <drop-down allow-empty="false"> + <entity-options description="${description}" entity-name="ProductFeatureIactnType"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> <form name="AddProductFeatureApplAttr" type="single" target="createProductFeatureApplAttr" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductFeatureApplAttr" /> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=642949&r1=642948&r2=642949&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Mon Mar 31 03:13:05 2008 @@ -1067,10 +1067,13 @@ <set field="headerItem" value="product"/> <set field="tabButtonItem" value="EditProductFeatures"/> <set field="labelTitleProperty" value="ProductFeatures"/> - + <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-name="product"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.bsh"/> + <entity-and entity-name="ProductFeatureIactn" list-name="featureInteractions"> + <field-map field-name="productId" env-name="parameters.productId"/> + </entity-and> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> @@ -1083,6 +1086,26 @@ </platform-specific> </widgets> </section> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.ListFeatureInteractions}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="ListFeatureInteractions" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AddFeatureInteraction}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="AddFeatureInteraction" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </container> </container> <container style="screenlet"> <container style="screenlet-title-bar"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |