svn commit: r778292 - in /ofbiz/branches/release09.04: ./ applications/party/script/org/ofbiz/party/communication/ applications/party/widget/partymgr/

[hansbak-2]

Author: hansbak
Date: Mon May 25 06:04:39 2009
New Revision: 778292

URL: http://svn.apache.org/viewvc?rev=778292&view=rev
Log:
Applied fix from trunk for revision: 778094
 some more corrections on internal notes: now possible to edit other users comunication events if the relationship is properly registered in partyrelationship

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml
    ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
    ofbiz/branches/release09.04/applications/party/widget/partymgr/PartyMenus.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 25 06:04: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,778278,778280
+/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,778278,778280

Modified: ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml?rev=778292&r1=778291&r2=778292&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml (original)
+++ ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/communication/CommunicationEventEvents.xml Mon May 25 06:04:39 2009
@@ -34,12 +34,7 @@
                 <set field="updStat.statusId" value="COM_ROLE_READ"/>
                 <set field="updStat.userLogin" from-field="userLogin"/>
                 <call-service service-name="setCommunicationEventRoleStatus" in-map-name="updStat"
-                    include-user-login="false"/>
-                <else>
-                    <add-error>
-                        <fail-property property="MyPortalNoAccess" resource="MyPortalUiLabels"/>
-                    </add-error>
-                </else>
+                include-user-login="false"/>
             </if-compare>
         </if-compare>
     </simple-method>
@@ -47,19 +42,15 @@
     <simple-method method-name="checkCommEventAccess"
         short-description="check if the user has access to the email of this party">
         <set field="found" value="false"/>
-        <if-compare-field operator="not-equals" field="parameters.partyId"
-            to-field="userLogin.partyId">
-            <entity-and list="emailOwners" entity-name="PartyRelationship"
-                filter-by-date="true">
+        <if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId">
+            <entity-and list="emailOwners" entity-name="PartyRelationship" filter-by-date="true">
                 <field-map field-name="partyIdFrom" value="${userLogin.partyId}"/>
                 <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN"/>
+                <field-map field-name="partyIdTo" from-field="parameters.partyId"/>
             </entity-and>
-            <iterate entry="emailOwners" list="emailOwner">
-                <if-compare operator="equals" value="${userLogin.partyId}"
-                    field="emailOwner.partyIdTo">
-                    <set field="found" value="true"/>
-                </if-compare>
-            </iterate>
+            <if-not-empty field="emailOwners">
+                <set field="found" value="true"/>
+            </if-not-empty>
             <else>
                 <set field="found" value="true"/>
             </else>

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=778292&r1=778291&r2=778292&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 Mon May 25 06:04:39 2009
@@ -69,9 +69,8 @@
                     <field-map field-name="partyId" from-field="parentCommEvent.partyIdFrom"/>
                 </entity-one>
                 
-                <if-compare-field field="parentCommEvent.partyIdFrom" operator="equals" to-field="parameters.partyIdTo">
-                    <set field="newEntity.partyIdTo" from-field="parentCommEvent.partyIdFrom"/>
-                </if-compare-field>
+                <set field="newEntity.partyIdFrom" from-field="parameters.partyIdFrom" default-value="parameters.userLogin.partyId"/>
+                <set field="newEntity.partyIdTo" from-field="parentCommEvent.partyIdFrom"/>
                 
                 <set field="newEntity.subject" value="RE: ${parentCommEvent.subject}"/>
                 

Modified: ofbiz/branches/release09.04/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/widget/partymgr/PartyMenus.xml?rev=778292&r1=778291&r2=778292&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/branches/release09.04/applications/party/widget/partymgr/PartyMenus.xml Mon May 25 06:04:39 2009
@@ -393,10 +393,9 @@
             <link target="NewDraftCommunicationEvent">
                 <parameter param-name="communicationEventTypeId" from-field="communicationEvent.communicationEventTypeId"/>
                 <parameter param-name="parentCommEventId" from-field="communicationEvent.communicationEventId"/>
-                <parameter param-name="partyIdFrom" from-field="parameters.partyId"/>
                 <parameter param-name="my" value="My"/>
                 <parameter param-name="statusId" value="COM_PENDING"/>
-                <parameter param-name="partyIdTo" from-field="communicationEvent.partyIdFrom"/>
+                <parameter param-name="partyIdFrom" from-field="parameters.partyId"/>
             </link>
         </menu-item>
         <menu-item name="forward" title="${uiLabelMap.PartyForward}">