[OFBiz] SVN: r6062 - in trunk/applications/product:
webapp/catalog/WEB-INF webapp/catalog/lookup widget/catalog
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Tue Nov 1 21:04:03 EST 2005
Author: jonesde
Date: 2005-11-01 20:03:57 -0600 (Tue, 01 Nov 2005)
New Revision: 6062
Modified:
trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
trunk/applications/product/widget/catalog/LookupScreens.xml
Log:
Added lookup screen for ProductCategory, also various misc cleanups and added missing request for facility lookup
Modified: trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/controller.xml 2005-11-02 00:24:24 UTC (rev 6061)
+++ trunk/applications/product/webapp/catalog/WEB-INF/controller.xml 2005-11-02 02:03:57 UTC (rev 6062)
@@ -1694,10 +1694,7 @@
</request-map>
<!-- ================ ProductStore Promos Requests ================= -->
- <request-map uri="EditProductStorePromos">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductStorePromos"/>
- </request-map>
+ <request-map uri="EditProductStorePromos"><security https="true" auth="true"/><response name="success" type="view" value="EditProductStorePromos"/></request-map>
<request-map uri="createProductStorePromoAppl">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createProductStorePromoAppl"/>
@@ -1718,10 +1715,7 @@
</request-map>
<!-- ================ ProductStore ProdCatalogs Requests ================= -->
- <request-map uri="EditProductStoreCatalogs">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductStoreCatalogs"/>
- </request-map>
+ <request-map uri="EditProductStoreCatalogs"><security https="true" auth="true"/><response name="success" type="view" value="EditProductStoreCatalogs"/></request-map>
<request-map uri="createProductStoreCatalog">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createProductStoreCatalog"/>
@@ -1766,10 +1760,7 @@
</request-map>
<!-- ================ Product Store Keyword Override ============= -->
- <request-map uri="editProductStoreKeywordOvrd">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductStoreKeywordOvrd" />
- </request-map>
+ <request-map uri="editProductStoreKeywordOvrd"><security https="true" auth="true"/><response name="success" type="view" value="EditProductStoreKeywordOvrd"/></request-map>
<request-map uri="createProductStoreKeywordOvrd">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createProductStoreKeywordOvrd"/>
@@ -1790,10 +1781,7 @@
</request-map>
<!-- ================ ProductStore Segment Requests ================= -->
- <request-map uri="ViewProductStoreSegments">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ViewProductStoreSegments"/>
- </request-map>
+ <request-map uri="ViewProductStoreSegments"><security https="true" auth="true"/><response name="success" type="view" value="ViewProductStoreSegments"/></request-map>
<!-- ================ Keyword Thesaurus Requests ================= -->
<request-map uri="editKeywordThesaurus">
@@ -1814,10 +1802,7 @@
</request-map>
<!-- ================ Product Review Requests ================= -->
- <request-map uri="pendingReviews">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="pendingReviews"/>
- </request-map>
+ <request-map uri="pendingReviews"><security https="true" auth="true"/><response name="success" type="view" value="pendingReviews"/></request-map>
<request-map uri="updateProductReview">
<security https="true" auth="true"/>
<event type="service" path="" invoke="updateProductReview"/>
@@ -1826,10 +1811,7 @@
</request-map>
<!-- ================ Supplier Product Requests ================= -->
- <request-map uri="EditProductSuppliers">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditSupplierProduct"/>
- </request-map>
+ <request-map uri="EditProductSuppliers"><security https="true" auth="true"/><response name="success" type="view" value="EditSupplierProduct"/></request-map>
<request-map uri="createSupplierProduct">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createSupplierProduct"/>
@@ -1869,10 +1851,7 @@
<!-- ================ Product Configuration Requests ================= -->
- <request-map uri="EditProductConfigs">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductConfigs"/>
- </request-map>
+ <request-map uri="EditProductConfigs"><security https="true" auth="true"/><response name="success" type="view" value="EditProductConfigs"/></request-map>
<request-map uri="createProductConfig">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createProductConfig"/>
@@ -1893,14 +1872,8 @@
</request-map>
<!-- ================ Configuration Requests ================= -->
- <request-map uri="FindProductConfigItems">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="FindProductConfigItems"/>
- </request-map>
- <request-map uri="EditProductConfigItem">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="EditProductConfigItem"/>
- </request-map>
+ <request-map uri="FindProductConfigItems"><security auth="true" https="true"/><response name="success" type="view" value="FindProductConfigItems"/></request-map>
+ <request-map uri="EditProductConfigItem"><security auth="true" https="true"/><response name="success" type="view" value="EditProductConfigItem"/></request-map>
<request-map uri="createProductConfigItem">
<security auth="true" https="true"/>
<event invoke="createProductConfigItem" path="" type="service"/>
@@ -1921,10 +1894,7 @@
</request-map>
<!-- Config Options Requests -->
- <request-map uri="EditProductConfigOptions">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="EditProductConfigOptions"/>
- </request-map>
+ <request-map uri="EditProductConfigOptions"><security auth="true" https="true"/><response name="success" type="view" value="EditProductConfigOptions"/></request-map>
<request-map uri="createProductConfigOption">
<security auth="true" https="true"/>
<event invoke="createProductConfigOption" type="service"/>
@@ -1964,30 +1934,18 @@
<response name="error" type="view" value="EditProductConfigOptions"/>
</request-map>
<!-- ================ Product Content Requests ================= -->
- <request-map uri="EditProductConfigItemContent">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductConfigItemContent"/>
- </request-map>
+ <request-map uri="EditProductConfigItemContent"><security https="true" auth="true"/><response name="success" type="view" value="EditProductConfigItemContent"/></request-map>
<request-map uri="updateProductConfigItemContent">
<security https="true" auth="true"/>
<event type="service" path="" invoke="updateProductConfigItem"/>
<response name="success" type="view" value="EditProductConfigItemContent"/>
<response name="error" type="view" value="EditProductConfigItemContent"/>
</request-map>
- <request-map uri="UploadProductConfigItemImage">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductConfigItemContent"/>
- </request-map>
+ <request-map uri="UploadProductConfigItemImage"><security https="true" auth="true"/><response name="success" type="view" value="EditProductConfigItemContent"/></request-map>
<!-- ================ Product Content Assoc Requests ================= -->
- <request-map uri="EditProductConfigItemContentContent">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductConfigItemContentContent"/>
- </request-map>
- <request-map uri="prepareAddContentToProductConfigItem">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditProductConfigItemContentContent"/>
- </request-map>
+ <request-map uri="EditProductConfigItemContentContent"><security https="true" auth="true"/><response name="success" type="view" value="EditProductConfigItemContentContent"/></request-map>
+ <request-map uri="prepareAddContentToProductConfigItem"><security https="true" auth="true"/><response name="success" type="view" value="EditProductConfigItemContentContent"/></request-map>
<request-map uri="addContentToProductConfigItem">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createProductConfigItemContent"/>
@@ -2020,35 +1978,17 @@
</request-map>
<!-- ================ Lookup Requests ================= -->
- <request-map uri="LookupContent">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="LookupContent"/>
- </request-map>
- <request-map uri="LookupFixedAsset">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="LookupFixedAsset"/>
- </request-map>
- <request-map uri="LookupProduct">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="LookupProduct"/>
- </request-map>
- <request-map uri="LookupVariantProduct">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="LookupVariantProduct"/>
- </request-map>
- <request-map uri="LookupVirtualProduct">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="LookupVirtualProduct"/>
- </request-map>
- <request-map uri="LookupProductFeature">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="LookupProductFeature"/>
- </request-map>
- <request-map uri="LookupPartyName">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="LookupPartyName"/>
- </request-map>
-
+ <request-map uri="LookupContent"><security auth="true" https="true"/><response name="success" type="view" value="LookupContent"/></request-map>
+ <request-map uri="LookupFixedAsset"><security auth="true" https="true"/><response name="success" type="view" value="LookupFixedAsset"/></request-map>
+ <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
+
+ <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
+ <request-map uri="LookupVariantProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map>
+ <request-map uri="LookupVirtualProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVirtualProduct"/></request-map>
+ <request-map uri="LookupProductCategory"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductCategory"/></request-map>
+ <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map>
+ <request-map uri="LookupProductStore"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductStore"/></request-map>
+
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -2162,6 +2102,7 @@
<view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
<view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/>
<view-map name="LookupVirtualProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVirtualProduct"/>
+ <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/>
<view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/>
<view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/>
<!-- end of view mappings -->
Modified: trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml 2005-11-02 00:24:24 UTC (rev 6061)
+++ trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml 2005-11-02 02:03:57 UTC (rev 6062)
@@ -165,10 +165,37 @@
</field>
</form>
- <form name="lookupProductFeature"
- default-title-style="tableheadtext"
- default-tooltip-style="tabletext" default-widget-style="inputBox"
- target="LookupProductFeature" title="" type="single">
+ <form name="lookupProductCategory" target="LookupProductCategory" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <auto-fields-entity entity-name="ProductCategory" default-field-type="find" />
+ <field name="productCategoryTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="ProductCategoryType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="listLookupProductCategory" list-iterator-name="listIt" paginate-target="LookupProductCategory" title="" type="list"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
+ <actions>
+ <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="ProductCategory"/>
+ </service>
+ </actions>
+ <auto-fields-entity entity-name="ProductCategory" default-field-type="display"/>
+ <field name="productCategoryTypeId"><display-entity entity-name="ProductCategoryType"/></field>
+ <field name="productCategoryId" title=" " widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${productCategoryId}" target="javascript:set_value('${productCategoryId}')"/>
+ </field>
+ </form>
+
+ <form name="lookupProductFeature" target="LookupProductFeature" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-entity entity-name="ProductFeature" default-field-type="find" />
<field name="productFeatureTypeId">
<drop-down allow-empty="true">
@@ -202,8 +229,8 @@
</field>
</form>
- <form name="LookupProductStore" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
- target="LookupProductStore" title="" type="single">
+ <form name="LookupProductStore" target="LookupProductStore" title="" type="single"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-entity entity-name="ProductStore" default-field-type="find"/>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: trunk/applications/product/widget/catalog/LookupScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/LookupScreens.xml 2005-11-02 00:24:24 UTC (rev 6061)
+++ trunk/applications/product/widget/catalog/LookupScreens.xml 2005-11-02 02:03:57 UTC (rev 6062)
@@ -124,6 +124,29 @@
</widgets>
</section>
</screen>
+ <screen name="LookupProductCategory">
+ <section>
+ <condition>
+ <or>
+ <if-has-permission permission="CATALOG" action="_VIEW"/>
+ </or>
+ </condition>
+ <actions>
+ <set field="title" value="Lookup Product Category"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="lookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <include-form name="listLookupProductCategory" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="LookupProductFeature">
<section>
<condition>
@@ -133,7 +156,6 @@
</condition>
<actions>
<set field="title" value="Lookup Product Feature"/>
- <set field="entityName" value="ProductFeature"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
More information about the Svn
mailing list