You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/11/12 10:00:46 UTC
svn commit: r835306 - in /ofbiz/trunk/specialpurpose/ebay:
config/EbayUiLabels.xml webapp/ebay/WEB-INF/controller.xml
widget/CommonScreens.xml widget/EbayForms.xml widget/EbayMenus.xml
widget/EbayScreens.xml
Author: ashish
Date: Thu Nov 12 09:00:36 2009
New Revision: 835306
URL: http://svn.apache.org/viewvc?rev=835306&view=rev
Log:
Applied patch from jira issue OFBIZ-3184 - Improvement in Ebay Configuration.
Implemented following points:
1) Created decorator for Ebay Configuration screens
2) Modified list and add Ebay configuration Form
3) Created Find Form
4) Crated menu and sub menu
5) Created Edit Ebay Configuration Screen
6) Modified Ebay Configuration screen with name FindEbayConfiguration
Thanks Parimal for the contribution.
Modified:
ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=835306&r1=835305&r2=835306&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Thu Nov 12 09:00:36 2009
@@ -52,6 +52,9 @@
<value xml:lang="en">OrderID / TransactionID</value>
<value xml:lang="it">Numero Ordine / Numero Transazione</value>
</property>
+ <property key="EbayEditEbayConfiguration">
+ <value xml:lang="en">Edit Ebay Configuration</value>
+ </property>
<property key="EbayExportToEbay">
<value xml:lang="de">zu eBay exportieren</value>
<value xml:lang="en">Export To eBay</value>
Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml?rev=835306&r1=835305&r2=835306&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml Thu Nov 12 09:00:36 2009
@@ -71,27 +71,28 @@
<!-- Ebay configuration setting request -->
- <request-map uri="EbayConfigurations">
+ <request-map uri="FindEbayConfigurations">
<security https="true" auth="true"/>
- <response name="success" type="view" value="EbayConfigurations"/>
+ <response name="success" type="view" value="FindEbayConfigurations"/>
+ <response name="error" type="view" value="FindEbayConfigurations"/>
</request-map>
<request-map uri="createEbayConfiguration">
<security https="true" auth="true"/>
<event type="service" invoke="createEbayConfiguration"/>
- <response name="success" type="view" value="EbayConfigurations"/>
- <response name="error" type="view" value="EbayConfigurations"/>
+ <response name="success" type="view" value="EditEbayConfiguration"/>
+ <response name="error" type="view" value="EditEbayConfiguration"/>
</request-map>
<request-map uri="updateEbayConfiguration">
<security https="true" auth="true"/>
<event type="service" invoke="updateEbayConfiguration"/>
- <response name="success" type="view" value="EbayConfigurations"/>
- <response name="error" type="view" value="EbayConfigurations"/>
+ <response name="success" type="view" value="EditEbayConfiguration"/>
+ <response name="error" type="view" value="EditEbayConfiguration"/>
</request-map>
<request-map uri="deleteEbayConfiguration">
<security https="true" auth="true"/>
<event type="service" invoke="deleteEbayConfiguration"/>
- <response name="success" type="view" value="EbayConfigurations"/>
- <response name="error" type="view" value="EbayConfigurations"/>
+ <response name="success" type="view" value="FindEbayConfigurations"/>
+ <response name="error" type="view" value="FindEbayConfigurations"/>
</request-map>
<request-map uri="EbayShippingMethods">
@@ -144,7 +145,12 @@
<response name="success" type="view" value="EbayOrders"/>
<response name="failure" type="view" value="EbayOrders"/>
</request-map>
-
+
+ <request-map uri="EditEbayConfiguration">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditEbayConfiguration"/>
+ <response name="error" type="view" value="EditEbayConfiguration"/>
+ </request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -155,7 +161,8 @@
<view-map name="ManageOrdersFromEbay" type="screen" page="component://ebay/widget/EbayScreens.xml#ManageOrdersFromEbay"/>
<view-map name="EbayOrders" type="screen" page="component://ebay/widget/EbayScreens.xml#EbayOrders"/>
- <view-map name="EbayConfigurations" type="screen" page="component://ebay/widget/EbayScreens.xml#EbayConfigurations"/>
+ <view-map name="FindEbayConfigurations" type="screen" page="component://ebay/widget/EbayScreens.xml#FindEbayConfigurations"/>
<view-map name="EbayShippingMethods" type="screen" page="component://ebay/widget/EbayScreens.xml#EbayShippingMethods"/>
+ <view-map name="EditEbayConfiguration" type="screen" page="component://ebay/widget/EbayScreens.xml#EditEbayConfiguration"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=835306&r1=835305&r2=835306&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Thu Nov 12 09:00:36 2009
@@ -118,4 +118,38 @@
</widgets>
</section>
</screen>
+
+ <screen name="CommonEbayConfigDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="eBayConfigurations"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for Ebay, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="EBAY" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="EbayConfigTabBar" location="component://ebay/widget/EbayMenus.xml"/>
+ <section>
+ <condition><not><if-empty field="ebayConfig"/></not>
+ </condition>
+ <widgets>
+ <include-menu name="EbayConfigSubTabBar" location="component://ebay/widget/EbayMenus.xml"/>
+ </widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3" text="${uiLabelMap.EbayViewPermissionError}"/>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=835306&r1=835305&r2=835306&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Thu Nov 12 09:00:36 2009
@@ -130,35 +130,37 @@
</form>
<!-- Ebay configuration settings forms -->
- <form name="ListEbayConfigurations" type="list" list-name="eBayConfigurations" target="updateEbayConfiguration"
+ <form name="ListEbayConfigurations" type="list" list-name="listIt" paginate-target="FindEbayConfigurations"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="EbayConfig">
- <order-by field-name="productStoreId"/>
- </entity-condition>
+ <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="EbayConfig"/>
+ <field-map field-name="orderBy" value="productStoreId DESC"/>
+ </service>
</actions>
- <auto-fields-service service-name="updateEbayConfiguration"/>
- <field name="productStoreId"><display/></field>
- <field name="token"><textarea cols="60" rows="5"/></field>
- <field name="customXml"><textarea cols="60" rows="5"/></field>
- <field name="webSiteId">
- <drop-down allow-empty="true">
- <entity-options description="${siteName}" entity-name="WebSite">
- <entity-order-by field-name="siteName"/>
- </entity-options>
- </drop-down>
+ <field name="productStoreId" title="${uiLabelMap.ProductProductStore}"><display-entity entity-name="ProductStore" description="${storeName} [${productStoreId}]"/></field>
+ <field name="devId"><display/></field>
+ <field name="appId"><display/></field>
+ <field name="certId"><display/></field>
+ <field name="compatibilityLevel"><display/></field>
+ <field name="webSiteId" title="${uiLabelMap.ProductWebSite}"><display-entity entity-name="WebSite" description="${siteName} [${webSiteId}]"/></field>
+ <field name="editEbayConfiguration" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
+ <hyperlink target="EditEbayConfiguration" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <parameter param-name="productStoreId"/>
+ </hyperlink>
</field>
- <field name="deleteEbayConfiguration" title="" widget-style="buttontext">
+ <field name="deleteEbayConfiguration" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEbayConfiguration" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="productStoreId"/>
</hyperlink>
</field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
<form name="AddEbayConfiguration" type="single" target="createEbayConfiguration" title="">
- <auto-fields-service service-name="createEbayConfiguration"/>
- <field name="productStoreId">
+ <alt-target use-when="ebayConfig != null" target="updateEbayConfiguration"/>
+ <field name="productStoreId" use-when="ebayConfig != null"><display/></field>
+ <field name="productStoreId" title="${uiLabelMap.ProductProductStore}" use-when="ebayConfig == null">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
@@ -166,16 +168,24 @@
</entity-options>
</drop-down>
</field>
+ <field name="devId"><text default-value="${ebayConfig.devId}" size="40"/></field>
+ <field name="appId"><text default-value="${ebayConfig.appId}" size="40"/></field>
+ <field name="certId"><text default-value="${ebayConfig.certId}" size="40"/></field>
<field name="token"><textarea cols="60" rows="5"/></field>
+ <field name="compatibilityLevel"><text default-value="${ebayConfig.compatibilityLevel}" size="5"/></field>
+ <field name="siteId"><text default-value="${ebayConfig.siteId}" size="5"/></field>
+ <field name="xmlGatewayUri"><text size="40"/></field>
<field name="customXml"><textarea cols="60" rows="5"/></field>
- <field name="webSiteId">
- <drop-down allow-empty="true">
+ <field name="webSiteId" title="${uiLabelMap.ProductWebSite}">
+ <drop-down>
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options description="${siteName}" entity-name="WebSite">
<entity-order-by field-name="siteName"/>
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" use-when="ebayConfig == null"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="ebayConfig != null"><submit button-type="button"/></field>
</form>
<form name="ListEbayShippingMethods" type="list" list-name="eBayShippingMethods" target="updateEbayShippingMethod"
@@ -239,4 +249,24 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
+ <form name="FindEbayConfig" type="single" target="FindEbayConfigurations">
+ <field name="productStoreId" title="${uiLabelMap.ProductProductStore}">
+ <drop-down>
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
+ <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
+ <entity-order-by field-name="storeName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="webSiteId" title="${uiLabelMap.ProductWebSite}">
+ <drop-down>
+ <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
+ <entity-options entity-name="WebSite" description="${siteName} [${webSiteId}]">
+ <entity-order-by field-name="siteName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml?rev=835306&r1=835305&r2=835306&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayMenus.xml Thu Nov 12 09:00:36 2009
@@ -19,10 +19,40 @@
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
<menu name="EbayAppBar" title="${uiLabelMap.EbayApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="eBayConfigurations" title="${uiLabelMap.EbayConfigurations}"><link target="EbayConfigurations"/></menu-item>
+ <menu-item name="eBayConfigurations" title="${uiLabelMap.EbayConfigurations}"><link target="FindEbayConfigurations"/></menu-item>
<menu-item name="eBayShippingMethods" title="${uiLabelMap.EbayShippingMethodConfigurations}"><link target="EbayShippingMethods"/></menu-item>
<menu-item name="export" title="${uiLabelMap.EbayExportToEbay}"><link target="advancedsearch"/></menu-item>
<menu-item name="importOrders" title="${uiLabelMap.EbayImportSingleTransactionFromEbay}"><link target="ManageOrdersFromEbay"/></menu-item>
<menu-item name="eBayOrders" title="${uiLabelMap.EbayEBayOrders}"><link target="eBayOrders"/></menu-item>
</menu>
+ <menu name="EbayConfigTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="find" title="${uiLabelMap.CommonFind}" >
+ <link target="FindEbayConfigurations"/>
+ </menu-item>
+ <menu-item name="newEbayConfig" title="${uiLabelMap.CommonNew}">
+ <condition>
+ <if-empty field="ebayConfig"/>
+ </condition>
+ <link target="EditEbayConfiguration"/>
+ </menu-item>
+ <menu-item name="editEbayConfig" title="${uiLabelMap.CommonEdit}">
+ <condition>
+ <and>
+ <not><if-empty field="ebayConfig"/></not>
+ </and>
+ </condition>
+ <link target="EditEbayConfiguration">
+ <parameter param-name="productStoreId" from-field="ebayConfig.productStoreId"/>
+ </link>
+ </menu-item>
+ </menu>
+ <menu name="EbayConfigSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ menu-container-style="button-bar button-style-2">
+ <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}">
+ <condition>
+ <not><if-empty field="ebayConfig"/></not>
+ </condition>
+ <link target="EditEbayConfiguration"/>
+ </menu-item>
+ </menu>
</menus>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=835306&r1=835305&r2=835306&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Thu Nov 12 09:00:36 2009
@@ -177,20 +177,28 @@
</section>
</screen>
- <screen name="EbayConfigurations">
+ <screen name="FindEbayConfigurations">
<section>
<actions>
<set field="titleProperty" value="EbayConfigurations"/>
- <set field="headerItem" value="eBayConfigurations"/>
- <set field="productStoreId" from-field="parameters.productStoreId"/>
+ <set field="tabButtonItem" value="find"/>
+ <set field="webSiteId" from-field="parameters.webSiteId"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonEbayConfigDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListEbayConfigurations" location="component://ebay/widget/EbayForms.xml"/>
- <screenlet id="add-ebay-configuration" title="${uiLabelMap.EbayAddEbayConfiguration}" collapsible="true">
- <include-form name="AddEbayConfiguration" location="component://ebay/widget/EbayForms.xml"/>
- </screenlet>
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindEbayConfig" location="component://ebay/widget/EbayForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListEbayConfigurations" location="component://ebay/widget/EbayForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -217,4 +225,32 @@
</widgets>
</section>
</screen>
+
+ <screen name="EditEbayConfiguration">
+ <section>
+ <actions>
+ <set field="titleProperty" value="EbayConfigurations"/>
+ <set field="productStoreId" from-field="parameters.productStoreId"/>
+ <entity-one entity-name="EbayConfig" value-field="ebayConfig"/>
+ <set field="tabButtonItem" value="${groovy:ebayConfig == null?'newEbayConfig' : 'editEbayConfig'}"/>
+ <set field="xmlGatewayUri" value="${groovy:ebayConfig == null?'' : org.ofbiz.base.util.StringUtil.wrapString(ebayConfig.xmlGatewayUri)}"/>
+ <set field="token" value="${groovy:ebayConfig == null?'' : org.ofbiz.base.util.StringUtil.wrapString(ebayConfig.token)}"/>
+ <set field="customXml" value="${groovy:ebayConfig == null?'' : org.ofbiz.base.util.StringUtil.wrapString(ebayConfig.customXml)}"/>
+ <set field="webSiteId" value="${groovy:ebayConfig == null?parameters.webSiteId : ebayConfig.webSiteId}"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonEbayConfigDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet id="addEbayConfigurationId" title="${groovy:ebayConfig == null?uiLabelMap.EbayAddEbayConfiguration : uiLabelMap.EbayEditEbayConfiguration}">
+ <include-form name="AddEbayConfiguration" location="component://ebay/widget/EbayForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file