svn commit: r642900 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: hansbak
Date: Sun Mar 30 23:30:54 2008 New Revision: 642900 URL: http://svn.apache.org/viewvc?rev=642900&view=rev Log: add the feature interaction screen in the catalog, and cleanup the supplierfeature screens Removed: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditSupplierFeature.bsh ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeature.ftl Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.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/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=642900&r1=642899&r2=642900&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun Mar 30 23:30:54 2008 @@ -4083,6 +4083,12 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> <value xml:lang="zh">ç¼è¾ç¹å¾ç±»å</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> <property key="PageTitleEditInventoryItem"> <value xml:lang="en">Edit Inventory Item</value> <value xml:lang="es">Editar ArtÃculo de Inventario</value> @@ -9186,6 +9192,9 @@ <value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸¥à¸±à¸à¸©à¸à¸°</value> <value xml:lang="zh">ç¹å¾ç±»å</value> </property> + <property key="ProductFeatureInteraction"> + <value xml:lang="en">Feature Interaction</value> + </property> <property key="ProductFeatures"> <value xml:lang="en">Features</value> <value xml:lang="es">CaracterÃsticas</value> @@ -11275,6 +11284,9 @@ <value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸¥à¸±à¸à¸©à¸à¸°à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ°å»ºç¹å¾ç±»å</value> </property> + <property key="ProductNewFeatureInterAction"> + <value xml:lang="en">New Feature InterAction</value> + </property> <property key="ProductNewGroup"> <value xml:lang="en">New Group</value> <value xml:lang="es">Nuevo grupo</value> @@ -14743,6 +14755,9 @@ </property> <property key="ProductSearchFeatureCategory"> <value xml:lang="en">Search feature category</value> + </property> + <property key="SearchFeatureInterAction"> + <value xml:lang="en">Search feature interAction</value> </property> <property key="ProductSearchFeatureType"> <value xml:lang="en">Search feature type</value> Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=642900&r1=642899&r2=642900&view=diff ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Sun Mar 30 23:30:54 2008 @@ -1504,7 +1504,6 @@ </entity> <entity entity-name="ProductFeatureIactnType" package-name="org.ofbiz.product.feature" - default-resource-name="ProductEntityLabels" title="Product Feature Interaction Type Entity"> <field name="productFeatureIactnTypeId" type="id-ne"></field> <field name="parentTypeId" 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=642900&r1=642899&r2=642900&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 Sun Mar 30 23:30:54 2008 @@ -252,7 +252,25 @@ <find-by-primary-key entity-name="ProductFeatureGroupAppl" map-name="lookupKeyValue" value-name="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> - + + <!-- Methods for ProductFeatureIactn --> + <simple-method method-name="createProductFeatureIactn" short-description="Create a Product Feature Interaction"> + <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureIactn you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-errors/> + <make-value value-name="newEntity" entity-name="ProductFeatureIactn"/> + <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-nonpk-fields map-name="parameters" value-name="newEntity"/> + <create-value value-name="newEntity"/> + </simple-method> + <simple-method method-name="removeProductFeatureIactn" short-description="Remove a Product Feature Interaction"> + <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureInteraction you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> + <check-errors/> + + <make-value value-name="lookupKeyValue" entity-name="ProductFeatureIactn"/> + <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/> + <remove-value value-name="lookedUpValue"/> + </simple-method> <!-- Methods for ProductFeatureType --> <simple-method method-name="createProductFeatureType" short-description="Create a Product Feature Type"> <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureType you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> Modified: ofbiz/trunk/applications/product/servicedef/services_feature.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_feature.xml?rev=642900&r1=642899&r2=642900&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_feature.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_feature.xml Sun Mar 30 23:30:54 2008 @@ -193,7 +193,19 @@ <attribute name="productFeatureId" type="String" mode="IN" optional="false"/> <attribute name="fromDate" type="java.sql.Timestamp" mode="IN" optional="false"/> </service> - + <!-- ProductFeatureIactn Services --> + <service name="createProductFeatureIactn" default-entity-name="ProductFeatureIactn" engine="simple" + location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="createProductFeatureIactn" auth="true"> + <description>Create a ProductFeatureIactn</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + <override name="productFeatureIactnTypeId" mode="IN" optional="false"/> + </service> + <service name="removeProductFeatureIactn" default-entity-name="ProductFeatureIactn" engine="simple" + location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="removeProductFeatureIactn" auth="true"> + <description>Remove a ProductFeatureIactn</description> + <auto-attributes include="pk" mode="IN" optional="false"/> + </service> <!-- ProductFeatureType Services --> <service name="createProductFeatureType" default-entity-name="ProductFeatureType" engine="simple" location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="createProductFeatureType" auth="true"> 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=642900&r1=642899&r2=642900&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sun Mar 30 23:30:54 2008 @@ -1154,6 +1154,26 @@ <security https="true" auth="true"/> <response name="success" type="view" value="EditFeatureType"/> </request-map> + <request-map uri="EditFeatureInterActions"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditFeatureInterActions"/> + </request-map> + <request-map uri="EditFeatureInterAction"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditFeatureInterAction"/> + </request-map> + <request-map uri="createProductFeatureIactn"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="createProductFeatureIactn"/> + <response name="success" type="view" value="EditFeatureInterAction"/> + <response name="error" type="view" value="EditFeatureInterAction"/> + </request-map> + <request-map uri="removeProductFeatureIactn"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="removeProductFeatureIactn"/> + <response name="success" type="request-redirect-noparam" value="EditFeatureInterActions"/> + <response name="error" type="view" value="EditFeatureInterAction"/> + </request-map> <request-map uri="createProductFeatureType"> <security https="true" auth="true"/> <event type="service" path="" invoke="createProductFeatureType"/> @@ -2554,6 +2574,8 @@ <view-map name="EditFeatureGroupAppls" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#EditFeatureGroupAppls"/> <view-map name="EditFeatureTypes" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#EditFeatureTypes"/> <view-map name="EditFeatureType" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#EditFeatureType"/> + <view-map name="EditFeatureInterActions" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#EditFeatureInterActions"/> + <view-map name="EditFeatureInterAction" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#EditFeatureInterAction"/> <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"/> 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=642900&r1=642899&r2=642900&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Sun Mar 30 23:30:54 2008 @@ -63,7 +63,7 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="CreateSupplierProductFeature" type="single" target="createSupplierProductFeature" title="" default-map-name="productFeature" + <form name="CreateSupplierProductFeature" type="single" target="createSupplierProductFeature" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createSupplierProductFeature" default-field-type="edit"/> <field name="partyId" title="${uiLabelMap.ProductSuppliers}"> @@ -71,7 +71,7 @@ <entity-options entity-name="PartyRoleAndPartyDetail" description="${groupName} ${firstName} ${lastName} [${partyId}]"> <entity-constraint name="roleTypeId" value="SUPPLIER"/> <entity-order-by field-name="groupName"/> - <entity-order-by field-name="firstName"/> + <entity-order-by field-name="lastName"/> </entity-options> </drop-down> </field> @@ -150,6 +150,64 @@ <field name="hasTable"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + <form name="FindFeatureInterAction" type="single" target="EditFeatureInterActions" + header-row-style="header-row" default-table-style="basic-table"> + <field name="productFeatureId"><text-find size="25" default-option="contains"></text-find></field> + <field name="productFeatureIdTo"><text-find size="25" default-option="contains"></text-find></field> + <field name="searchButton" widget-style="smallSubmit"><submit/></field> + </form> + <form name="ListFeatureInterActions" list-name="listIt" target="" title="" type="list" paginate-target="EditFeatureInterAction" + odd-row-style="alternate-row" default-table-style="basic-table"> + <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="ProductFeatureIactn"/> + <field-map field-name="orderBy" value="productFeatureId"/> + </service> + </actions> + + <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="removeProductFeatureIactn?productFeatureId=${productFeatureId}&productFeatureIdTo=${productFeatureIdTo}" description="${uiLabelMap.CommonDelete}"/> + </field> + </form> + <form name="EditFeatureInterAction" type="single" target="createProductFeatureIactn" title="" default-map-name="productFeatureIactn" + header-row-style="header-row" default-table-style="basic-table"> + <field name="productFeatureId"> + <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"> + <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.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> <form name="ListFeatureGroupAppls" type="multi" use-row-submit="false" list-name="productFeatureGroupAndAppls" target="UpdateProductFeatureGroupAppl?productFeatureGroupId=${productFeatureGroupId}" title="" odd-row-style="alternate-row" default-table-style="basic-table"> <field name="productFeatureGroupId"><hidden/></field> 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=642900&r1=642899&r2=642900&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl Sun Mar 30 23:30:54 2008 @@ -25,6 +25,7 @@ <li><a href="<@ofbizUrl>EditFeatureTypes</@ofbizUrl>" class="${selectedClassMap.FeatureType?default(unselectedClassName)}">${uiLabelMap.ProductFeatureType}</a></li> <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> </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=642900&r1=642899&r2=642900&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sun Mar 30 23:30:54 2008 @@ -61,13 +61,12 @@ <actions> <set field="titleProperty" value="PageTitleEditFeature"/> <set field="headerItem" value="featurecats"/> - <entity-one entity-name="ProductFeature" value-name="productFeature" auto-field-map="true"/> - <!--<script location="component://product/webapp/catalog/WEB-INF/actions/feature/EditFeature.bsh"/>--> - <script location="component://product/webapp/catalog/WEB-INF/actions/feature/EditSupplierFeature.bsh"/> + <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures"> + <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/> + </entity-and> </actions> <widgets> - <!--<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">--> <decorator-screen name="CommonFeatureDecorator"> <decorator-section name="body"> <container style="screenlet"> @@ -84,9 +83,34 @@ </section> </container> </container> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/feature/EditFeature.ftl"/></html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.ProductSupplierSpecificFeatureInformation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditSupplierProductFeatures" 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.ProductCreateInformationNewSupplier}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="CreateSupplierProductFeature" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -138,7 +162,6 @@ <set field="titleProperty" value="PageTitleEditFeatureType"/> <set field="headerItem" value="featurecats"/> <set field="tabButtonItem" value="FeatureType"/> - <set field="productFeatureTypeId" from-field="parameters.productFeatureTypeId"/> <entity-one entity-name="ProductFeatureType" value-name="productFeatureType"/> </actions> @@ -155,6 +178,80 @@ <section> <widgets> <include-form name="EditFeatureType" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditFeatureInterActions"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditFeatureInterActions"/> + <set field="headerItem" value="featurecats"/> + <set field="tabButtonItem" value="FeatureInterAction"/> + </actions> + <widgets> + <decorator-screen name="CommonFeatureDecorator"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.SearchFeatureInterAction}"/> + </container> + </container> + <container style="screenlet-body"> + <container><link target="EditFeatureInterAction" text="${uiLabelMap.ProductNewFeatureInterAction}" 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.PageTitleAddFeatureInterActions}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFeatureInterActions" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditFeatureInterAction"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditFeatureInterAction"/> + <set field="headerItem" value="featurecats"/> + <set field="tabButtonItem" value="FeatureInterAction"/> + + <set field="productFeatureId" from-field="parameters.productFeatureId"/> + <set field="productFeatureIdTo" from-field="parameters.productFeatureIdTo"/> + <entity-one entity-name="ProductFeatureIactn" value-name="productFeatureIactn"/> + + </actions> + <widgets> + <decorator-screen name="CommonFeatureDecorator"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.PageTitleEditFeatureInterAction}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditFeatureInterAction" location="component://product/webapp/catalog/feature/FeatureForms.xml"/> </widgets> </section> </container> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |