Author: hansbak
Date: Thu Apr 30 06:21:24 2009
New Revision: 770083
URL: http://svn.apache.org/viewvc?rev=770083&view=rev
Log:
delete communication event from unknownCommevent list did not return properly
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.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=770083&r1=770082&r2=770083&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Thu
Apr 30 06:21:24 2009
@@ -771,7 +771,7 @@
<request-map uri="deleteCommunicationEvent">
<security https="true" auth="true"/>
<event type="service" invoke="deleteCommunicationEvent"/>
- <response name="success" type="view-home"
value="MyCommunicationEvents"/>
+ <response name="success" type="view-home"/>
<response name="error" type="view-last"/>
</request-map>
<request-map uri="deleteUnknownCommunicationEvent">
@@ -782,15 +782,13 @@
</request-map>
<request-map uri="deleteCommunicationEvents">
<security https="true" auth="true"/>
- <event type="service-multi"
invoke="deleteCommunicationEventWorkEffort"/>
- <response name="success" type="view"
- value="ListUnknownPartyComms"/>
- <response name="error" type="view"
- value="ListUnknownPartyComms"/>
+ <event type="service-multi" invoke="deleteCommunicationEvent"/>
+ <response name="success" type="view-home"/>
+ <response name="error" type="view-home"/>
</request-map>
<request-map uri="listUnknownPartyComms">
<security https="true" auth="true"/>
- <response name="success" type="view" value="ListUnknownPartyComms"/>
+ <response name="success" type="view" value="ListUnknownPartyComms"
save-home-view="true"/>
</request-map>
<request-map uri="editRequestFromCommEvent">
<security https="true" auth="true"/>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=770083&r1=770082&r2=770083&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
Thu Apr 30 06:21:24 2009
@@ -404,14 +404,14 @@
</form>
<form name="ListUnknownPartyEmails" extends="ListCommEvents" type="multi"
use-row-submit="true" separate-columns="true"
-
target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&delContentDataResource=Y"
- header-row-style="header-row-2">
+ target="deleteCommunicationEvents" header-row-style="header-row-2">
<actions>
<entity-and list="commEvents"
entity-name="CommunicationEventAndRole">
<field-map field-name="statusId" value="COM_UNKNOWN_PARTY"/>
<order-by field-name="-entryDate"/>
</entity-and>
</actions>
+ <field name="delContentDataResource"><hidden value="Y"/></field>
<field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
<check/>
</field>
@@ -703,15 +703,13 @@
<form name="ListMyUnknownPartyEmails" type="multi" use-row-submit="true"
title="Email List unknown parties" list-name="commEventsUnknown"
- target="deleteCommunicationEvents?donePage=${parameters.donePage}"
default-entity-name="CommunicationEvent"
+ target="deleteCommunicationEvents"
default-entity-name="CommunicationEvent"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<row-actions>
<set field="subject" from-field="subject"
default-value="${uiLabelMap.PartyNoSubject}"/>
</row-actions>
<field name="delContentDataResource"><hidden value="Y"/></field>
- <field name="communicationEventId">
- <hidden />
- </field>
+ <field name="communicationEventId"><hidden/></field>
<field name="subject" widget-style="buttontext"
widget-area-style="fieldWidth300">
<hyperlink description="${subject}"
target="ViewCommunicationEvent">
<parameter param-name="communicationEventId"/>
@@ -721,15 +719,9 @@
<field name="entryDate">
<display description="${date:dateTimeStr(entryDate, timeZone,
locale)}"/>
</field>
- <field name="note" widget-area-style="fieldWidth200">
- <display />
- </field>
- <field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
- <check />
- </field>
- <field name="deleteSelectedButton" widget-style="smallSubmit">
- <submit />
- </field>
+ <field name="note" widget-area-style="fieldWidth200"><display/></field>
+ <field name="_rowSubmit"
title="${uiLabelMap.CommonYes}"><check/></field>
+ <field name="deleteSelectedButton"
widget-style="smallSubmit"><submit/></field>
</form>
<form name="allocateMsgToPartyForm" type="single"
target="allocateMsgToParty" title="create a new party for a unknown incoming
email address">
