Author: ashish
Date: Sat Feb 27 17:53:56 2010
New Revision: 917000
URL: http://svn.apache.org/viewvc?rev=917000&view=rev
Log:
Remaining part of issue OFBIZ-3508 - Improvement on party and catalog component.
Now added new Product Store tab with the existing tab that we see when we edit
any party. With the help of this tab any party can be added to more then one
store.
Thanks Amit for the contribution.
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=917000&r1=916999&r2=917000&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat
Feb 27 17:53:56 2010
@@ -1253,6 +1253,34 @@
<response name="success" type="view" value="PartyGeoLocation"/>
<response name="error" type="view" value="viewprofile"/>
</request-map>
+
+ <!-- ProductStoreRole -->
+ <request-map uri="ViewProductStoreRoles">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewProductStoreRoles"/>
+ </request-map>
+ <request-map uri="FindProductStoreRoles">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewProductStoreRoles"/>
+ </request-map>
+ <request-map uri="storeCreateRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createProductStoreRole"/>
+ <response name="success" type="view" value="ViewProductStoreRoles"/>
+ <response name="error" type="view" value="ViewProductStoreRoles"/>
+ </request-map>
+ <request-map uri="storeUpdateRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateProductStoreRole"/>
+ <response name="success" type="view" value="ViewProductStoreRoles"/>
+ <response name="error" type="view" value="ViewProductStoreRoles"/>
+ </request-map>
+ <request-map uri="storeRemoveRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeProductStoreRole"/>
+ <response name="success" type="view" value="ViewProductStoreRoles"/>
+ <response name="error" type="view" value="ViewProductStoreRoles"/>
+ </request-map>
<!-- external communication event; mark as read using 1px image request
-->
<request-map uri="ceimages" track-serverhit="false" track-visit="false">
@@ -1383,5 +1411,7 @@
<view-map name="UpdateCommOrders" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommOrders"/>
<view-map name="UpdateCommProducts" type="screen"
page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommProducts"/>
+
+ <view-map name="ViewProductStoreRoles" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#ViewProductStoreRoles"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=917000&r1=916999&r2=917000&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Feb 27
17:53:56 2010
@@ -1081,4 +1081,64 @@
<field name="submit" title="${uiLabelMap.CommonUpdate}"
use-when="partyIdentification != null"><submit /></field>
</form>
+ <form name="EditProductStoreRole" type="single"
extends="EditProductStoreRole"
extends-resource="component://product/widget/catalog/StoreForms.xml">
+ <field name="partyId"><hidden/></field>
+ <field name="productStoreId" use-when="productStoreRole==null"
title="${uiLabelMap.ProductStoreId}" tooltip="${uiLabelMap.CommonRequired}"
widget-style="required">
+ <drop-down>
+ <entity-options entity-name="ProductStore"
key-field-name="productStoreId" description="${storeName} (${productStoreId})">
+ <entity-order-by field-name="productStoreId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="productStoreId" use-when="productStoreRole!=null"
title="${uiLabelMap.ProductStoreId}"><display/></field>
+ </form>
+ <form name="FindProductStoreRole" type="single"
extends="FindProductStoreRole"
extends-resource="component://product/widget/catalog/StoreForms.xml">
+ <field name="partyId"><hidden/></field>
+ <field name="productStoreId" title="${uiLabelMap.ProductStoreId}"
tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="ProductStore"
key-field-name="productStoreId" description="${storeName} (${productStoreId})">
+ <entity-order-by field-name="productStoreId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ </form>
+ <form name="ListProductStoreRole" type="list" list-name="listIt"
paginate-target="FindProductStoreRoles" default-entity-name="ProductStoreRole"
separate-columns="true"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result"
result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="ProductStoreRole"/>
+ <field-map field-name="orderBy"
from-field="parameters.sortField"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
+ <field name="productStoreId" title="${uiLabelMap.ProductStoreId}">
+ <display-entity entity-name="ProductStore"
key-field-name="productStoreId" description="${storeName}">
+ <sub-hyperlink target="/catalog/control/EditProductStore"
target-type="inter-app" description="${storeName} (${productStoreId})" >
+ <parameter param-name="productStoreId"/>
+ </sub-hyperlink>
+ </display-entity>
+ </field>
+ <field name="roleTypeId"
title="${uiLabelMap.PartyRoleTypeId}"><display-entity
entity-name="RoleType"/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ <field name="sequenceNum"><display/></field>
+ <field name="editLink" widget-style="buttontext"
title="${uiLabelMap.CommonEdit}">
+ <hyperlink target="FindProductStoreRoles"
description="${uiLabelMap.CommonEdit}">
+ <parameter param-name="partyId"/>
+ <parameter param-name="productStoreId"/>
+ <parameter param-name="roleTypeId"/>
+ <parameter param-name="fromDate"/>
+ </hyperlink>
+ </field>
+ <field name="deleteLink" widget-style="buttontext"
title="${uiLabelMap.CommonDelete}">
+ <hyperlink target="storeRemoveRole"
description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="partyId"/>
+ <parameter param-name="productStoreId"/>
+ <parameter param-name="roleTypeId"/>
+ <parameter param-name="fromDate"/>
+ </hyperlink>
+ </field>
+ </form>
</forms>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=917000&r1=916999&r2=917000&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sat Feb 27
17:53:56 2010
@@ -161,6 +161,11 @@
<parameter param-name="partyId"/>
</link>
</menu-item>
+ <menu-item name="productStoreRoles"
title="${uiLabelMap.ProductProductStoreRoles}">
+ <link target="ViewProductStoreRoles">
+ <parameter param-name="partyId"/>
+ </link>
+ </menu-item>
</menu>
<menu name="ProfileSubTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
menu-container-style="button-bar button-style-2">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=917000&r1=916999&r2=917000&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Feb 27
17:53:56 2010
@@ -1109,4 +1109,33 @@
</section>
</screen>
+ <screen name="ViewProductStoreRoles">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="PageTitleFindProductStoreRoles"/>
+ <set field="headerItem" value="store"/>
+ <set field="tabButtonItem" value="FindProductStoreRoles"/>
+ <set field="labelTitleProperty"
value="ProductProductStoreRoles"/>
+ <set field="parameters.fromDate"
from-field="parameters.fromDate" type="Timestamp"/>
+ <entity-one entity-name="ProductStoreRole"
value-field="productStoreRole" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet
title="${uiLabelMap.PageTitleEditProductStoreRoles}">
+ <include-form name="EditProductStoreRole"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ </screenlet>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindProductStoreRole"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListProductStoreRole"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
