Author: hansbak
Date: Wed Dec 16 04:25:07 2009
New Revision: 891123
URL: http://svn.apache.org/viewvc?rev=891123&view=rev
Log:
close commevent did not return to the list, create custrequest should use form
from projectmanager if component is available
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=891123&r1=891122&r2=891123&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
Wed Dec 16 04:25:07 2009
@@ -486,6 +486,7 @@
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="statusId"
value="COM_ROLE_COMPLETED"/>
+ <parameter param-name="portalPageId"
from-field="parameters.portalPageId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -920,6 +921,7 @@
<form name="ListDraftEmails" type="list" extends="ListCommEvents"
extends-resource="component://party/widget/partymgr/CommunicationEventForms.xml"
target="deleteCommunicationEvent"
use-row-submit="true" header-row-style="header-row-2"
list-name="commEventDraft">
+ <field name="portalPageId"><hidden
value="${parameters.portalPageId}"/></field>
<field name="subject">
<hyperlink description="${subject}"
target="${parameters._LAST_VIEW_NAME_}">
<parameter param-name="communicationEventId"/>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=891123&r1=891122&r2=891123&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
(original)
+++
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
Wed Dec 16 04:25:07 2009
@@ -850,21 +850,38 @@
<entity-one entity-name="CustRequest"
value-field="custRequest"/>
<set field="statusId"
from-field="custRequest.statusId"/>
<entity-one entity-name="StatusItem"
value-field="currentStatus"/>
+ <set field="projectMgrExists"
value="${groovy:org.ofbiz.base.component.ComponentConfig.componentExists("projectmgr")}"/>
</actions>
<widgets>
<section>
<condition>
- <if-compare field="parameters.small"
operator="equals" value="Y"/>
+ <if-compare field="projectMgrExists"
operator="equals" value="true"/>
</condition>
+ <actions>
+ <set field="fromPartyId"
from-field="communicationEvent.partyIdFrom"/>
+ <script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy"/>
+ </actions>
<widgets>
<screenlet
title="${uiLabelMap.OrderRequest}">
- <include-form
name="EditSmallCustRequest"
location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ <include-form name="EditCustRequest"
location="component://projectmgr/widget/forms/CustRequestForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
- <screenlet
title="${uiLabelMap.OrderRequest}">
- <include-form name="EditCustRequest"
location="component://order/widget/ordermgr/CustRequestForms.xml"/>
- </screenlet>
+ <section>
+ <condition>
+ <if-compare
field="parameters.small" operator="equals" value="Y"/>
+ </condition>
+ <widgets>
+ <screenlet
title="${uiLabelMap.OrderRequest}">
+ <include-form
name="EditSmallCustRequest"
location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ </screenlet>
+ </widgets>
+ <fail-widgets>
+ <screenlet
title="${uiLabelMap.OrderRequest}">
+ <include-form
name="EditCustRequest"
location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+ </screenlet>
+ </fail-widgets>
+ </section>
</fail-widgets>
</section>
</widgets>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=891123&r1=891122&r2=891123&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Wed Dec 16
04:25:07 2009
@@ -511,6 +511,7 @@
<parameter param-name="partyId"
from-field="parameters.partyId"/>
<parameter param-name="roleTypeId"
from-field="parameters.roleTypeId"/>
<parameter param-name="statusId" value="COM_ROLE_COMPLETED"/>
+ <parameter param-name="portalPageId"
from-field="parameters.portalPageId"/>
</link>
</menu-item>
<menu-item name="delete" title="${uiLabelMap.CommonDelete}">
