Author: ashish
Date: Sat Aug 27 12:53:23 2016
New Revision: 1758021
URL: http://svn.apache.org/viewvc?rev=1758021&view=rev
Log:
Applied patch from jira issue - OFBIZ-7628 - Add Communication Event Roles
functionality is not working.
Thanks Ravi for the contribution.
Modified:
ofbiz/trunk/applications/party/minilang/communication/CommunicationEventEvents.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
Modified:
ofbiz/trunk/applications/party/minilang/communication/CommunicationEventEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/communication/CommunicationEventEvents.xml?rev=1758021&r1=1758020&r2=1758021&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/minilang/communication/CommunicationEventEvents.xml
(original)
+++
ofbiz/trunk/applications/party/minilang/communication/CommunicationEventEvents.xml
Sat Aug 27 12:53:23 2016
@@ -124,25 +124,6 @@ under the License.
<set field="my" value="My"/>
<field-to-request field="my"/>
</simple-method>
-
- <simple-method method-name="createCommunicationEventRole"
- short-description="Add a role to a communictaion event and save
communication event itseld">
-
- <!-- save header fields -->
- <set-service-fields service-name="updateCommunicationEvent"
map="formInput" to-map="updateMap"/>
- <set field="updateMap.communicationEventId"
from-field="parameters.communicationEventId"/>
- <call-service service-name="updateCommunicationEvent"
in-map-name="updateMap"/>
-
- <!-- add role -->
- <set-service-fields service-name="createCommunicationEventRole"
to-map="createRole" map="parameters"/>
- <call-service service-name="createCommunicationEventRole"
in-map-name="createRole"/>
-
- <!-- Return to request -->
- <field-to-request field="parameters.communicationEventId"
request-name="communicationEventId"/>
- <set field="my" value="My"/>
- <field-to-request field="my"/>
- </simple-method>
-
<simple-method method-name="allocateMsgToParty"
short-description="Allocate an emailaddress to an existing/new party, update
the communication event accordingly">
<entity-one entity-name="CommunicationEvent"
value-field="communicationEvent"/>
<if-empty field="communicationEvent">
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=1758021&r1=1758020&r2=1758021&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat
Aug 27 12:53:23 2016
@@ -770,7 +770,7 @@ under the License.
</request-map>
<request-map uri="createCommunicationEventRole">
<security https="true" auth="true"/>
- <event type="simple" invoke="createCommunicationEventRole"
path="component://party/minilang/communication/CommunicationEventEvents.xml"/>
+ <event type="service" invoke="createCommunicationEventRole"/>
<response name="success" type="view-home"
value="EditCommunicationEvent"/>
<response name="error" type="view-home"
value="EditCommunicationEvent"/>
</request-map>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1758021&r1=1758020&r2=1758021&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
Sat Aug 27 12:53:23 2016
@@ -705,12 +705,6 @@ under the License.
<form name="AddEventRole" type="single"
target="createCommunicationEventRole"
header-row-style="header-row" default-table-style="basic-table">
- <field name="subject"><hidden/></field>
- <field name="content"><hidden/></field>
- <field name="partyIdTo"><hidden/></field>
- <field name="datetimeStarted"><hidden/></field>
- <field name="my"><hidden value="${my}"/></field>
- <field name="datetimeStarted"><hidden/></field>
<field name="communicationEventId"><hidden/></field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}"
position="1"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" position="2">
@@ -722,10 +716,8 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title=" ">
- <hyperlink also-hidden="true"
- target-type="plain" description="${uiLabelMap.PartyAddRole}"
-
target="javascript:(document.AddEventRole.communicationEventId.value=document.EditEmail.communicationEventId.value),(document.AddEventRole.datetimeStarted.value=document.EditEmail.datetimeStarted.value),(document.AddEventRole.partyIdTo.value=document.EditEmail.partyIdTo.value),(document.AddEventRole.subject.value=document.EditEmail.subject.value),(document.AddEventRole.content.value=document.EditEmail.content.value),(document.AddEventRole.submit())"/>
+ <field name="submitButton" title="${uiLabelMap.PartyAddRole}">
+ <submit button-type="button"/>
</field>
</form>
