svn commit: r783260 - in /ofbiz/branches/release09.04: ./ applications/party/script/org/ofbiz/party/communication/ applications/party/webapp/partymgr/WEB-INF/ applications/party/webapp/partymgr/communication/

[hansbak-2]

Author: hansbak
Date: Wed Jun 10 09:01:39 2009
New Revision: 783260

URL: http://svn.apache.org/viewvc?rev=783260&view=rev
Log:
Applied fix from trunk for revision: 783257
 commevent/note: correct screen flow, avoid log warning message

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
    ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 10 09:01:39 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257

Modified: ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=783260&r1=783259&r2=783260&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Wed Jun 10 09:01:39 2009
@@ -231,13 +231,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"/>
@@ -260,13 +262,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/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=783260&r1=783259&r2=783260&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/controller.xml Wed Jun 10 09:01:39 2009
@@ -765,7 +765,7 @@
     <request-map uri="updateCommunicationEvent">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateCommunicationEvent"/>
-        <response name="success" type="view-home"/>
+        <response name="success" type="view-home" value="EditCommunicationEvent"/>
         <response name="error" type="view" value="EditCommunicationEvent"/>
     </request-map>
     <request-map uri="deleteCommunicationEvent">

Modified: ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml?rev=783260&r1=783259&r2=783260&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml Wed Jun 10 09:01:39 2009
@@ -149,6 +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"><hidden value="${parameters.my}"/></field>
         <field name="fromEmailAddr" parameter-name="contactMechIdFrom">
             <drop-down>
                 <list-options list-name="emailAddresses" description="${infoString}" key-name="contactMechId"/>
@@ -182,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}"/>