svn commit: r643847 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: hansbak
Date: Wed Apr 2 04:10:32 2008 New Revision: 643847 URL: http://svn.apache.org/viewvc?rev=643847&view=rev Log: rename FeaturePrice entity to ProductFeaturePrice and move the the related screens in the feature detailed info. Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/entitydef/entitygroup.xml ofbiz/trunk/applications/product/entitydef/entitymodel.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml ofbiz/trunk/applications/product/servicedef/services_feature.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl 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=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Apr 2 04:10:32 2008 @@ -3607,6 +3607,9 @@ <value xml:lang="it">Aggiungi Gruppo Stabilimento Arrivo</value> <value xml:lang="th">Add Facility Group Rollup</value> </property> + <property key="PageTitleAddFeaturePrice"> + <value xml:lang="en">Add Feature Price</value> + </property> <property key="PageTitleAddInventoryItemLabelAppls"> <value xml:lang="en">Add Inventory Item Label Appls</value> <value xml:lang="it">Aggiungi Applicabilità Etichetta Riga Inventario</value> @@ -4068,6 +4071,9 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¸¥à¸±à¸à¸©à¸à¸°à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> <value xml:lang="zh">ç¼è¾ç¹å¾åç±»ç¹å¾</value> </property> + <property key="PageTitleEditFeaturePrice"> + <value xml:lang="en">Edit Feature Price</value> + </property> <property key="PageTitleEditFeatureType"> <value xml:lang="en">Edit Feature Type</value> <value xml:lang="it">Aggiorna Tipo Caratteristica</value> @@ -4085,12 +4091,6 @@ </property> <property key="AddFeatureInteraction"> <value xml:lang="en">Add Feature Interaction</value> - </property> - <property key="PageTitleEditFeaturePrice"> - <value xml:lang="en">Edit Feature Price</value> - </property> - <property key="PageTitleAddFeaturePrice"> - <value xml:lang="en">Add Feature Price</value> </property> <property key="ListFeatureInteractions"> <value xml:lang="en">List Feature Interactions</value> Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?rev=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Wed Apr 2 04:10:32 2008 @@ -123,7 +123,7 @@ <entity-group group="org.ofbiz" entity="ProductFeatureIactn" /> <entity-group group="org.ofbiz" entity="ProductFeatureIactnType" /> <entity-group group="org.ofbiz" entity="ProductFeatureType" /> - <entity-group group="org.ofbiz" entity="FeaturePrice"/> + <entity-group group="org.ofbiz" entity="ProductFeaturePrice"/> <!-- ========================================================= --> <!-- org.ofbiz.product.inventory --> Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Apr 2 04:10:32 2008 @@ -1528,9 +1528,9 @@ </relation> </entity> - <entity entity-name="FeaturePrice" + <entity entity-name="ProductFeaturePrice" package-name="org.ofbiz.product.price" - title="Feature Price Entity"> + title="Product Feature Price Entity"> <field name="productFeatureId" type="id-ne"></field> <field name="productPriceTypeId" type="id-ne"></field> <field name="currencyUomId" type="id"></field> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Wed Apr 2 04:10:32 2008 @@ -353,9 +353,9 @@ <!-- Feature Price Service --> <simple-method method-name="createFeaturePrice" short-description="Create a Feature Price"> - <make-value value-name="newEntity" entity-name="FeaturePrice"/> + <make-value value-name="newEntity" entity-name="ProductFeaturePrice"/> <if-empty field-name="parameters.productFeatureId"> - <sequenced-id-to-env sequence-name="FeaturePrice" env-name="parameters.productFeatureId"/> + <sequenced-id-to-env sequence-name="ProductFeaturePrice" env-name="parameters.productFeatureId"/> </if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> @@ -375,7 +375,7 @@ <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateFeaturePrice" short-description="Update a feature price"> - <entity-one entity-name="FeaturePrice" value-name="lookedUpValue"/> + <entity-one entity-name="ProductFeaturePrice" value-name="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> @@ -386,9 +386,9 @@ <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="deleteFeaturePrice" short-description="Delete a feature price"> - <make-value entity-name="FeaturePrice" value-name="lookupPKMap"/> + <make-value entity-name="ProductFeaturePrice" value-name="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="FeaturePrice" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="ProductFeaturePrice" map-name="lookupPKMap" value-name="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/product/servicedef/services_feature.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_feature.xml?rev=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_feature.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_feature.xml Wed Apr 2 04:10:32 2008 @@ -245,7 +245,7 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <!-- Feature Price Service --> - <service name="createFeaturePrice" engine="simple" default-entity-name="FeaturePrice" + <service name="createFeaturePrice" engine="simple" default-entity-name="ProductFeaturePrice" location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="createFeaturePrice" auth="true"> <description>Create a Feature Price</description> <auto-attributes mode="IN" include="pk" optional="false"/> @@ -259,7 +259,7 @@ <override name="fromDate" mode="INOUT" optional="true"/> <override name="price" optional="false"/> </service> - <service name="updateFeaturePrice" engine="simple" default-entity-name="FeaturePrice" + <service name="updateFeaturePrice" engine="simple" default-entity-name="ProductFeaturePrice" location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="updateFeaturePrice" auth="true"> <description>Update a Feature Price</description> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -271,7 +271,7 @@ </auto-attributes> <override name="price" optional="false"/> </service> - <service name="deleteFeaturePrice" engine="simple" default-entity-name="FeaturePrice" + <service name="deleteFeaturePrice" engine="simple" default-entity-name="ProductFeaturePrice" location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="deleteFeaturePrice" auth="true"> <description>Delete a Feature Price</description> <auto-attributes include="pk" mode="IN" optional="false"/> 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=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Wed Apr 2 04:10:32 2008 @@ -1089,6 +1089,10 @@ <security https="true" auth="true"/> <response name="success" type="view" value="EditFeature"/> </request-map> + <request-map uri="CreateFeature"> + <security https="true" auth="true"/> + <response name="success" type="view" value="CreateFeature"/> + </request-map> <request-map uri="createProductFeature"> <security https="true" auth="true"/> <event type="service" path="" invoke="createProductFeature"/> @@ -1210,25 +1214,25 @@ </request-map> <request-map uri="ListFeaturePrice"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListFeaturePrice"/> + <response name="success" type="view" value="EditFeature"/> </request-map> <request-map uri="createFeaturePrice"> <security https="true" auth="true"/> <event type="service" invoke="createFeaturePrice"/> - <response name="success" type="view" value="ListFeaturePrice"/> - <response name="error" type="view" value="ListFeaturePrice"/> + <response name="success" type="view" value="EditFeature"/> + <response name="error" type="view" value="EditFeature"/> </request-map> <request-map uri="updateFeaturePrice"> <security https="true" auth="true"/> <event type="service" invoke="updateFeaturePrice"/> - <response name="success" type="request-redirect-noparam" value="ListFeaturePrice"/> - <response name="error" type="view" value="ListFeaturePrice"/> + <response name="success" type="view" value="EditFeature"/> + <response name="error" type="view" value="EditFeature"/> </request-map> <request-map uri="deleteFeaturePrice"> <security https="true" auth="true"/> <event type="service" invoke="deleteFeaturePrice"/> - <response name="success" type="view" value="ListFeaturePrice"/> - <response name="error" type="view" value="ListFeaturePrice"/> + <response name="success" type="view" value="EditFeature"/> + <response name="error" type="view" value="EditFeature"/> </request-map> <!-- ================ Product Feature Requests ================= --> <request-map uri="EditProductFeatures"> @@ -2613,6 +2617,7 @@ <view-map name="QuickAddProductFeatures" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#QuickAddProductFeatures"/> <view-map name="CreateProductFeature" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#CreateProductFeature"/> <view-map name="ListFeaturePrice" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#ListFeaturePrice"/> + <view-map name="CreateFeature" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#CreateFeature"/> <view-map name="FindProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindProdCatalog"/> <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Wed Apr 2 04:10:32 2008 @@ -21,7 +21,7 @@ <h3>${uiLabelMap.ProductEditFeaturesForFeatureCategory} "${(curProductFeatureCategory.description)?if_exists}"</h3> </div> <div class="screenlet-body"> - <a href="<@ofbizUrl>EditFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewFeature}</a> + <a href="<@ofbizUrl>CreateFeature?productFeatureCategoryId=${productFeatureCategoryId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewFeature}</a> <br> <form action="<@ofbizUrl>QuickAddProductFeatures</@ofbizUrl>" method="post"> <div> 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=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Wed Apr 2 04:10:32 2008 @@ -271,7 +271,7 @@ <field name="searchButton" widget-style="smallSubmit"><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" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true"> <actions> <set field="parameters.noConditionFind" value="Y"/> @@ -299,10 +299,12 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListFeaturePrice" type="list" paginate-target="ListFeaturePrice" target="updateFeaturePrice" + <form name="ListFeaturePrice" type="list" target="updateFeaturePrice" list-name="productFeaturePrice" odd-row-style="alternate-row" default-table-style="basic-table"> <actions> - <entity-condition entity-name="FeaturePrice"/> + <entity-and entity-name="ProductFeaturePrice" list-name="productFeaturePrice"> + <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/> + </entity-and> </actions> <field name="productFeatureId"><hidden/></field> <field name="productPriceTypeId" title="${uiLabelMap.ProductPriceType}"><display-entity entity-name="ProductPriceType"/></field> @@ -320,6 +322,7 @@ <actions> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> + <field name="productFeatureId"><hidden/></field> <field name="productPriceTypeId" title="${uiLabelMap.ProductPriceType}"> <drop-down allow-empty="false" no-current-selected-key="DEFAULT_PRICE"> <entity-options entity-name="ProductPriceType" description="${description}"> @@ -327,7 +330,10 @@ </entity-options> </drop-down> </field> - <field name="currencyUomId" title="${uiLabelMap.ProductCurrency}"> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}" position="1"><date-time/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}" position="2"><date-time/></field> + <field name="price" title="${uiLabelMap.ProductPrice}" widget-style="required" position="1"><text size="25"/></field> + <field name="currencyUomId" title="${uiLabelMap.ProductCurrency}" position="2"> <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}"> <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> @@ -335,9 +341,6 @@ </entity-options> </drop-down> </field> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> - <field name="price" title="${uiLabelMap.ProductPrice}" widget-style="required"><text size="25"/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl?rev=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl Wed Apr 2 04:10:32 2008 @@ -26,7 +26,6 @@ <li><a href="<@ofbizUrl>EditFeatureCategories</@ofbizUrl>" class="${selectedClassMap.FeatureCategory?default(unselectedClassName)}">${uiLabelMap.ProductFeatureCategory}</a></li> <li><a href="<@ofbizUrl>EditFeatureGroups</@ofbizUrl>" class="${selectedClassMap.FeatureGroup?default(unselectedClassName)}">${uiLabelMap.ProductFeatureGroup}</a></li> <li><a href="<@ofbizUrl>EditFeatureInterActions</@ofbizUrl>" class="${selectedClassMap.FeatureInterAction?default(unselectedClassName)}">${uiLabelMap.ProductFeatureInteraction}</a></li> - <li><a href="<@ofbizUrl>ListFeaturePrice</@ofbizUrl>" class="${selectedClassMap.FeaturePrice?default(unselectedClassName)}">${uiLabelMap.FormFieldTitle_featurePrice}</a></li> </ul> </div> <br/> Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=643847&r1=643846&r2=643847&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Wed Apr 2 04:10:32 2008 @@ -86,6 +86,34 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> + <label text="${uiLabelMap.PageTitleEditFeaturePrice}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFeaturePrice" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.PageTitleAddFeaturePrice}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="CreateFeaturePrice" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> <label text="${uiLabelMap.ProductSupplierSpecificFeatureInformation}"/> </container> </container> @@ -521,6 +549,38 @@ </container> <container style="screenlet-body"> <include-form name="CreateFeaturePrice" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="CreateFeature"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditFeature"/> + <set field="headerItem" value="featurecats"/> + <entity-one entity-name="ProductFeature" value-name="productFeature" auto-field-map="true"/> + <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures"> + <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/> + </entity-and> + </actions> + <widgets> + <decorator-screen name="CommonFeatureDecorator"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.ProductEditFeature} : ${productFeature.description}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProductFeature" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> + </widgets> + </section> </container> </container> </decorator-section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |