You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2014/08/28 11:56:12 UTC
svn commit: r1621109 - in /ofbiz/trunk/applications:
order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
party/widget/partymgr/PartyForms.xml party/widget/partymgr/PartyScreens.xml
Author: mor
Date: Thu Aug 28 09:56:11 2014
New Revision: 1621109
URL: http://svn.apache.org/r1621109
Log:
Small code improvement.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy?rev=1621109&r1=1621108&r2=1621109&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy Thu Aug 28 09:56:11 2014
@@ -47,21 +47,6 @@ if (returnId) {
context.currentStatus = returnHeader.getRelatedOne("StatusItem", true);
}
-} else {
- partyId = parameters.partyId;
- returnHeaders = delegator.findList("ReturnHeader", EntityCondition.makeCondition("fromPartyId", EntityOperator.EQUALS, partyId), null, null, null, false);
- returnList = [];
- returnHeaders.each { returnHeader ->
- returnMap = [:];
- returnMap.returnId = returnHeader.returnId;
- statusItem = returnHeader.getRelatedOne("StatusItem", false);
- returnMap.statusId = statusItem.description;
- returnMap.fromPartyId = returnHeader.fromPartyId;
- returnMap.toPartyId = returnHeader.toPartyId;
-
- returnList.add(returnMap);
- }
- context.returnList = returnList;
}
context.returnHeader = returnHeader;
context.returnId = returnId;
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1621109&r1=1621108&r2=1621109&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Thu Aug 28 09:56:11 2014
@@ -1086,7 +1086,7 @@ under the License.
</form>
<form name="PartyReturns" type="list" list-name="returnList" default-table-style="basic-table hover-bar">
<field name="returnId"><display/></field>
- <field name="statusId"><display/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="fromPartyId"><display/></field>
<field name="toPartyId"><display/></field>
</form>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1621109&r1=1621108&r2=1621109&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Thu Aug 28 09:56:11 2014
@@ -1093,7 +1093,9 @@ under the License.
</section>
<section>
<actions>
- <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy"/>
+ <entity-and entity-name="ReturnHeader" list="returnList">
+ <field-map field-name="fromPartyId" from-field="parameters.partyId"/>
+ </entity-and>
</actions>
<widgets>
<screenlet title="${uiLabelMap.OrderOrderReturns}">