svn commit: r783257 - in /ofbiz/trunk/applications/party: script/org/ofbiz/party/communication/CommunicationEventServices.xml webapp/partymgr/WEB-INF/controller.xml webapp/partymgr/communication/CommForms.xml

[hansbak-2]

Author: hansbak
Date: Wed Jun 10 08:51:19 2009
New Revision: 783257

URL: http://svn.apache.org/viewvc?rev=783257&view=rev
Log:
commevent/note: correct screen flow, avoid log warning message

Modified:
    ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=783257&r1=783256&r2=783257&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Wed Jun 10 08:51:19 2009
@@ -230,13 +230,15 @@
             </condition>
             <then>
                 <!-- updating partyId from old: -->
-                <entity-one entity-name="CommunicationEventRole" value-field="roleFrom">
-                    <field-map field-name="communicationEventId" from-field="event.communicationEventId"/>
-                    <field-map field-name="partyId" from-field="event.partyIdFrom"/>
-                    <field-map field-name="roleTypeId" value="ORIGINATOR"/>
-                </entity-one>
-                <if-not-empty field="roleFrom">
-                    <remove-value value-field="roleFrom"/>
+                <if-not-empty field="event.partyIdFrom">
+                    <entity-one entity-name="CommunicationEventRole" value-field="roleFrom">
+                        <field-map field-name="communicationEventId" from-field="event.communicationEventId"/>
+                        <field-map field-name="partyId" from-field="event.partyIdFrom"/>
+                        <field-map field-name="roleTypeId" value="ORIGINATOR"/>
+                    </entity-one>
+                    <if-not-empty field="roleFrom">
+                        <remove-value value-field="roleFrom"/>
+                    </if-not-empty>
                 </if-not-empty>
                 <!-- add new role -->
                 <set field="newRoleFrom.partyId" from-field="parameters.partyIdFrom"/>
@@ -259,13 +261,15 @@
             </condition>
             <then>
                 <!-- check if role exist then delete old role -->
-                <entity-one entity-name="CommunicationEventRole" value-field="roleTo">
-                    <field-map field-name="communicationEventId" from-field="event.communicationEventId"/>
-                    <field-map field-name="partyId" from-field="event.partyIdTo"/>
-                    <field-map field-name="roleTypeId" value="ADDRESSEE"/>
-                </entity-one>
-                <if-not-empty field="roleTo">
-                    <remove-value value-field="roleTo"/>
+                <if-not-empty field="event.partyIdTo">
+                    <entity-one entity-name="CommunicationEventRole" value-field="roleTo">
+                        <field-map field-name="communicationEventId" from-field="event.communicationEventId"/>
+                        <field-map field-name="partyId" from-field="event.partyIdTo"/>
+                        <field-map field-name="roleTypeId" value="ADDRESSEE"/>
+                    </entity-one>
+                    <if-not-empty field="roleTo">
+                        <remove-value value-field="roleTo"/>
+                    </if-not-empty>
                 </if-not-empty>
                 <!-- add new role -->
                 <set field="newRoleTo.partyId" from-field="parameters.partyIdTo"/>

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=783257&r1=783256&r2=783257&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Wed Jun 10 08:51:19 2009
@@ -767,7 +767,7 @@
     <request-map uri="updateCommunicationEvent">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateCommunicationEvent"/>
-        <response name="success" type="view" value="EditCommunicationEvent"/>
+        <response name="success" type="view-home" value="EditCommunicationEvent"/>
         <response name="error" type="view" value="EditCommunicationEvent"/>
     </request-map>
     <request-map uri="sendCommunicationEvent">

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=783257&r1=783256&r2=783257&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Wed Jun 10 08:51:19 2009
@@ -149,7 +149,7 @@
         <field name="parentCommEventId" use-when="parentCommEventId != null"><hidden value="${parameters.parentCommEventId}"/></field>
         <field name="parentCommEventId" use-when="originalCommEventId != null"><hidden value="${parameters.originalCommEventId}"/></field>
         <field name="partyIdFrom"><hidden/></field>
-        <field name="my" use-when="parameters.get(&quot;my&quot;)==null"><hidden value="parameters.my"/></field>
+        <field name="my"><hidden value="${parameters.my}"/></field>
         <field name="fromEmailAddr" parameter-name="contactMechIdFrom">
             <drop-down>
                 <list-options list-name="emailAddresses" description="${infoString}" key-name="contactMechId"/>
@@ -183,6 +183,7 @@
         <field name="statusId"><hidden value="COM_PENDING"/></field>
         <field name="datetimeStarted"><hidden/></field>
         <field name="partyIdFrom"><hidden/></field>
+        <field name="my"><hidden value="${parameters.my}"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
             <drop-down>
                 <list-options list-name="recentParties" key-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"/>