[OFBiz] SVN: r5935 - in trunk/applications/product:
webapp/catalog/WEB-INF webapp/catalog/catalog
webapp/catalog/category webapp/catalog/config
webapp/catalog/feature webapp/catalog/lookup
webapp/catalog/product webapp/catalog/store
webapp/facility/lookup webapp/facility/shipment widget/catalog
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Sat Oct 8 04:49:56 EDT 2005
Author: jonesde
Date: 2005-10-08 03:49:43 -0500 (Sat, 08 Oct 2005)
New Revision: 5935
Modified:
trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
trunk/applications/product/webapp/catalog/category/CategoryForms.xml
trunk/applications/product/webapp/catalog/config/ConfigForms.xml
trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
trunk/applications/product/webapp/catalog/product/ProductForms.xml
trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
trunk/applications/product/widget/catalog/LookupScreens.xml
trunk/applications/product/widget/catalog/StoreScreens.xml
Log:
Fixed some issues related to the ProductStore -> Segment screen, also some general cleanups
Modified: trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/controller.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/catalog/WEB-INF/controller.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -2157,10 +2157,12 @@
<!-- Lookup request mappings -->
<view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
<view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/>
+ <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
+
<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="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/>
- <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
+ <view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/>
<!-- end of view mappings -->
</site-conf>
Modified: trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -81,7 +81,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeProdCatalogFromParty?prodCatalogId=${prodCatalogId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}"
description="[Delete]" also-hidden="false"/>
</field>
@@ -113,7 +113,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteProdCatalogStore?prodCatalogId=${prodCatalogId}&productStoreId=${productStoreId}&fromDate=${fromDate}"
description="[Delete]" also-hidden="false"/>
</field>
@@ -132,11 +132,11 @@
<field name="fromDate"><display/></field>
<field name="thruDate"></field>
<field name="sequenceNum"></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeProductCategoryFromProdCatalog?prodCatalogId=${prodCatalogId}&productCategoryId=${productCategoryId}&fromDate=${fromDate}&prodCatalogCategoryTypeId=${prodCatalogCategoryTypeId}"
description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
</field>
- <field name="makeTopLink" title="&nbsp;" widget-style="buttontext">
+ <field name="makeTopLink" title=" " widget-style="buttontext">
<hyperlink target="EditCategory?CATALOG_TOP_CATEGORY=${productCategoryId}&productCategoryId=${productCategoryId}"
description="[${uiLabelMap.ProductMakeTop}]" also-hidden="false"/>
</field>
Modified: trunk/applications/product/webapp/catalog/category/CategoryForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/category/CategoryForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/catalog/category/CategoryForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -39,7 +39,7 @@
<field name="productCategoryId"><hidden/></field>
<field name="attrValue"><text size="60"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteProductCategoryAttribute?productCategoryId=${productCategoryId}&attrName=${attrName}"
description="[${uiLabelMap.CommonDelete}]"/>
</field>
Modified: trunk/applications/product/webapp/catalog/config/ConfigForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/config/ConfigForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/catalog/config/ConfigForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -140,7 +140,7 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeContentFromProductConfigItem?configItemId=${productContent.configItemId}&contentId=${productContent.contentId}&confItemContentTypeId=${productContent.confItemContentTypeId}&fromDate=${productContent.fromDate}"
description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
</field>
Modified: trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/feature/FeatureForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/catalog/feature/FeatureForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -51,7 +51,7 @@
</entity-options>
</drop-down>
</field>
- <field use-when="productFeature!=null&&productFeature.getString("productFeatureCategoryId")!=null" name="categoryLink" title="&nbsp;" widget-style="buttontext">
+ <field use-when="productFeature!=null&&productFeature.getString("productFeatureCategoryId")!=null" name="categoryLink" title=" " widget-style="buttontext">
<hyperlink target="/EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeature.productFeatureCategoryId}" target-type="intra-app"
description="[${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}]" also-hidden="false"/>
</field>
@@ -108,7 +108,7 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeSupplierProductFeature?productFeatureId=${productFeatureId}&partyId=${partyId}"
description="[${uiLabelMap.CommonDelete}]"/>
</field>
Modified: trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -62,12 +62,12 @@
<field-map field-name="entityName" value="Product"/>
</service>
</actions>
- <field name="productId" title="&nbsp;" widget-style="buttontext">
+ <field name="productId" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_values('${productId}', '${internalName}')"/>
</field>
<field name="internalName"><display/></field>
<field name="productTypeId"><display/></field>
- <field name="searchVariants" title="&nbsp;" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
+ <field name="searchVariants" title=" " widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
<hyperlink also-hidden="false" target-type="plain" description="Variants" target="LookupVariantProduct?productId=${productId}"/>
</field>
</form>
@@ -84,11 +84,11 @@
title="" type="list">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
- <field-map field-name="inputFields" env-name="requestParameters"/>
+ <field-map field-name="inputFields" env-name="parameters"/>
<field-map field-name="entityName" value="Product"/>
</service>
</actions>
- <field name="productId" title="&nbsp;" widget-style="buttontext">
+ <field name="productId" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
</field>
</form>
@@ -116,17 +116,42 @@
<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="listLookupProductFeature" list-name="entityList" paginate-target="LookupProductFeature" title="" type="list"
+ <form name="listLookupProductFeature" list-iterator-name="listIt" paginate-target="LookupProductFeature" 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="requestParameters"/>
- <field-map field-name="entityName" env-name="entityName"/>
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="ProductFeature"/>
</service>
</actions>
<auto-fields-entity entity-name="ProductFeature" default-field-type="display"/>
- <field name="productFeatureId" title="&nbsp;" widget-style="buttontext">
+ <field name="productFeatureId" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
</field>
</form>
+
+ <form name="LookupProductStore" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+ target="LookupProductStore" title="" type="single">
+ <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>
+ </form>
+ <form name="listLookupProductStore" list-iterator-name="listIt" target="" paginate-target="LookupProductStore" title="" type="list"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
+ <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="ProductStore"/>
+ </service>
+ </actions>
+
+ <!-- <auto-fields-entity entity-name="ProductStore" default-field-type="display"/> -->
+
+ <field name="productStoreId" title=" " widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${productStoreId}" target="javascript:set_value('${productStoreId}')"/>
+ </field>
+ <field name="primaryStoreGroupId"><display/></field>
+ <field name="storeName"><display/></field>
+ <!-- <field name="companyName"><display/></field> -->
+ </form>
</forms>
Modified: trunk/applications/product/webapp/catalog/product/ProductForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/product/ProductForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/catalog/product/ProductForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -269,7 +269,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteProductPrice?productId=${productId}&productPriceTypeId=${productPriceTypeId}&productPricePurposeId=${productPricePurposeId}&currencyUomId=${currencyUomId}&productStoreGroupId=${productStoreGroupId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -307,7 +307,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteProductPaymentMethodType?productId=${productId}&productPricePurposeId=${productPricePurposeId}&paymentMethodTypeId=${paymentMethodTypeId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -349,7 +349,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="comments" title="${uiLabelMap.ProductComments}" ><ignored/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeProductFromCategory?productId=${productId}&productCategoryId=${productCategoryId}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -424,7 +424,7 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeContentFromProduct?productId=${productContent.productId}&contentId=${productContent.contentId}&productContentTypeId=${productContent.productContentTypeId}&fromDate=${productContent.fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -584,11 +584,11 @@
<field name="lastPrice"><display/></field>
<field name="currencyUomId"><display/></field>
- <field name="updateLink" title="&nbsp;" widget-style="buttontext">
+ <field name="updateLink" title=" " widget-style="buttontext">
<hyperlink target="EditProductSuppliers?productId=${productId}&partyId=${partyId}&currencyUomId=${currencyUomId}&minimumOrderQuantity=${minimumOrderQuantity}"
description="${uiLabelMap.CommonUpdate}" also-hidden="false"/>
</field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeSupplierProduct?productId=${productId}&partyId=${partyId}&currencyUomId=${currencyUomId}&minimumOrderQuantity=${minimumOrderQuantity}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -652,7 +652,7 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeContentFromCategory?productCategoryId=${categoryContent.productCategoryId}&contentId=${categoryContent.contentId}&prodCatContentTypeId=${categoryContent.prodCatContentTypeId}&fromDate=${categoryContent.fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
@@ -720,7 +720,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteProductConfig?productId=${productId}&configItemId=${configItemId}&sequenceNum=${sequenceNum}&fromDate=${fromDate}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
Modified: trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -45,9 +45,9 @@
</entity-options>
</drop-down>
</field>
- <field use-when="productStore!=null&&productStore.getString("inventoryFacilityId")!=null" name="inventoryFacilityLink" title="&nbsp;" widget-style="buttontext">
+ <field use-when="productStore!=null&&productStore.getString("inventoryFacilityId")!=null" name="inventoryFacilityLink" title=" " widget-style="buttontext">
<hyperlink target="/facility/control/EditFacility?facilityId=${productStore.inventoryFacilityId}" target-type="inter-app"
- description="[Edit Facility ${productStore.inventoryFacilityId}]" also-hidden="false"/>
+ description="Edit Facility ${productStore.inventoryFacilityId}" also-hidden="false"/>
</field>
<field name="manualAuthIsCapture" widget-style="selectBox">
@@ -212,15 +212,15 @@
<field name="productStoreId"><hidden/></field>
<field name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}" widget-style="tabletext">
<display-entity entity-name="ProdCatalog" description="${catalogName}" also-hidden="true">
- <sub-hyperlink target="EditProdCatalog?prodCatalogId=${prodCatalogId}" description="[${prodCatalogId}]" link-style="buttontext"/>
+ <sub-hyperlink target="EditProdCatalog?prodCatalogId=${prodCatalogId}" description="${prodCatalogId}" link-style="buttontext"/>
</display-entity>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteProductStoreCatalog?prodCatalogId=${prodCatalogId}&productStoreId=${productStoreId}&fromDate=${fromDate}"
- description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
@@ -281,7 +281,7 @@
target="updateProductStoreKeywordOvrd" title="" list-name="productStorekeywordOvrdList"
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<auto-fields-service service-name="updateProductStoreKeywordOvrd"/>
- <field name="productStoreId" ><hidden/></field>
+ <field name="productStoreId"><hidden/></field>
<field name="keyword" title="${uiLabelMap.ProductKeyword}"><display description="${keyword}"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display description="${fromDate}"/></field>
<field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetType}" widget-style="selectBox">
@@ -293,27 +293,27 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteProductStoreKeywordOvrd?productStoreId=${productStoreId}&keyword=${keyword}&fromDate=${fromDate}"
- description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="ViewProductStoreSegments" default-title-style="tableheadtext"
+ <form name="ViewProductStoreSegments" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="tabletext"
target="" paginate-target="" title="" type="list">
<actions>
- <entity-and entity-name="SegmentGroup" >
- <field-map field-name="productStoreId"/>
- </entity-and>
+ <entity-and entity-name="SegmentGroup">
+ <field-map field-name="productStoreId"/>
+ </entity-and>
</actions>
<field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.ProductSegmentGroupId}">
- <hyperlink also-hidden="false" target-type="inter-app" description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup?segmentGroupId=${segmentGroupId}&DONE_PAGE=/catalog/control/ViewProductStoreSegments?productStoreId=${productStoreId}"/>
+ <hyperlink also-hidden="false" target-type="inter-app" description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup?segmentGroupId=${segmentGroupId}"/>
</field>
- <field name="segmentGroupTypeId" title="${uiLabelMap.ProductSegmentGroupTypeId}"><display/></field>
+ <field name="segmentGroupTypeId" title="${uiLabelMap.ProductSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType"/></field>
<field name="description" title="${uiLabelMap.ProductSegmentGroupDescription}"><display/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
- <hyperlink target="/marketing/control/deleteSegmentGroup?segmentGroupId=${segmentGroupId}&DONE_PAGE=/catalog/control/ViewProductStoreSegments?productStoreId=${productStoreId}"
- description="[${uiLabelMap.CommonDelete}]" also-hidden="false" target-type="inter-app"/>
+ <field name="deleteLink" title=" " widget-style="buttontext">
+ <hyperlink target="/marketing/control/deleteSegmentGroup?segmentGroupId=${segmentGroupId}"
+ description="${uiLabelMap.CommonDelete}" also-hidden="false" target-type="inter-app"/>
</field>
</form>
</forms>
Modified: trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -50,7 +50,7 @@
<field-map field-name="entityName" value="Facility"/>
</service>
</actions>
- <field name="facilityId" title="&nbsp;" widget-style="buttontext">
+ <field name="facilityId" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${facilityId}" target="javascript:set_values('${facilityId}', '${facilityName}')"/>
</field>
<field name="facilityName"><display/></field>
Modified: trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
===================================================================
--- trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -153,7 +153,7 @@
<!-- planned volume -->
<field name="volume" title="${uiLabelMap.CommonVolume}"><display/></field>
<field name="volumeUom" title="${uiLabelMap.CommonUom}"><display/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeOrderShipmentFromShipment?shipmentId=${shipmentId}&shipmentItemSeqId=${shipmentItemSeqId}&orderId=${orderId}&orderItemSeqId=${orderItemSeqId}" description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
</field>
</form>
Modified: trunk/applications/product/widget/catalog/CatalogCommonScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/CatalogCommonScreens.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/widget/catalog/CatalogCommonScreens.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -91,7 +91,7 @@
<html><html-template location="component://product/webapp/catalog/catalog/CatalogTabBar.ftl"/></html>
</platform-specific>
<container>
- <link target="EditProdCatalog" text="[${uiLabelMap.ProductNewProdCatalog}]" style="buttontext"/>
+ <link target="EditProdCatalog" text="${uiLabelMap.ProductNewProdCatalog}" style="buttontext"/>
</container>
<!-- add Create Product and View Product (in ecommerce) links -->
@@ -133,7 +133,7 @@
<label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label>
</container>
<container>
- <link target="EditProductStore" text="[${uiLabelMap.ProductNewProductStore}]" style="buttontext"/>
+ <link target="EditProductStore" text="${uiLabelMap.ProductNewProductStore}" style="buttontext"/>
</container>
</widgets>
</section>
Modified: trunk/applications/product/widget/catalog/LookupScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/LookupScreens.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/widget/catalog/LookupScreens.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -117,12 +117,39 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="lookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
- <include-form name="listLookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <include-form name="listLookupProductFeature" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+ <!-- ProductStore Lookup Screen -->
+ <screen name="LookupProductStore">
+ <section>
+ <condition>
+ <or>
+ <if-has-permission permission="CATALOG" action="_VIEW"/>
+ </or>
+ </condition>
+ <actions>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+
+ <set field="title" value="Lookup ProductStore"/>
+ <set field="entityName" value="ProductStore"/>
+ <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="LookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ <include-form name="listLookupProductStore" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: trunk/applications/product/widget/catalog/StoreScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/StoreScreens.xml 2005-10-08 08:48:55 UTC (rev 5934)
+++ trunk/applications/product/widget/catalog/StoreScreens.xml 2005-10-08 08:49:43 UTC (rev 5935)
@@ -346,7 +346,7 @@
<decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <link target="marketing/control/viewSegmentGroup?productStoreId=${productStoreId}&DONE_PAGE=/catalog/control/ViewProductStoreSegments?productStoreId=${productStoreId}" text="[${uiLabelMap.ProductNewSegment}]" style="buttontext" url-mode="inter-app"/>
+ <link target="/marketing/control/viewSegmentGroup?productStoreId=${productStoreId}" text="${uiLabelMap.ProductNewSegment}" style="buttontext" url-mode="inter-app"/>
</container>
<include-form name="ViewProductStoreSegments" location="component://product/webapp/catalog/store/ProductStoreForms.xml"/>
</decorator-section>
More information about the Svn
mailing list