svn commit: r778294 - in /ofbiz/branches/release09.04: ./ applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy applications/party/widget/partymgr/PartyMenus.xml

[hansbak-2]

Author: hansbak
Date: Mon May 25 06:08:14 2009
New Revision: 778294

URL: http://svn.apache.org/viewvc?rev=778294&view=rev
Log:
Applied fix from trunk for revision: 778107
 close buttom was not shown properly

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy
    ofbiz/branches/release09.04/applications/party/widget/partymgr/PartyMenus.xml

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

Modified: ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy?rev=778294&r1=778293&r2=778294&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy (original)
+++ ofbiz/branches/release09.04/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy Mon May 25 06:08:14 2009
@@ -21,18 +21,11 @@
 import org.ofbiz.entity.util.EntityUtil;
 
 if (parameters.communicationEventId) {
-    communicationEventRoles = delegator.findByAnd("CommunicationEventAndRole",
+    context.communicationEventRole = delegator.findByPrimaryKey("CommunicationEventRole",
            ["communicationEventId" : parameters.communicationEventId,
-            "partyId" : userLogin.partyId,
-            "statusId" : "COM_ROLE_READ"
+            "partyId" : parameters.partyId,
+            "roleTypeId" : parameters.roleTypeId
            ]);
-    if (!communicationEventRoles) {
-        communicationEventRoles = delegator.findByAnd("CommunicationEventAndRole",
-           ["communicationEventId" : parameters.communicationEventId,
-            "partyId" : userLogin.partyId
-           ]);
-    }
-    if (communicationEventRoles) {
-        context.myCommunicationEventRole = communicationEventRoles.get(0);
-    }
-}
\ No newline at end of file
+
+    context.projectMgrExists = ComponentConfig.componentExists("projectmgr");
+}

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=778294&r1=778293&r2=778294&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:08:14 2009
@@ -450,15 +450,15 @@
             <condition>
                 <and>
                     <not><if-empty field="communicationEvent"/></not>
-                    <if-compare field="myCommunicationEventRole.roleStatusId" operator="equals" value="COM_ROLE_READ"/>
+                    <if-compare field="communicationEventRole.statusId" operator="equals" value="COM_ROLE_READ"/>
                     <if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
                     <if-compare field="communicationEvent.statusId" operator="not-equals" value="COM_UNKNOWN_PARTY"/>
                 </and>
             </condition>
             <link target="setCommunicationEventRoleStatus">
-                <parameter param-name="communicationEventId" from-field="myCommunicationEventRole.communicationEventId"/>
-                <parameter param-name="partyId" from-field="myCommunicationEventRole.partyId"/>
-                <parameter param-name="roleTypeId" from-field="myCommunicationEventRole.roleTypeId"/>
+                <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/>
+                <parameter param-name="partyId" from-field="parameters.partyId"/>
+                <parameter param-name="roleTypeId" from-field="parameters.roleTypeId"/>
                 <parameter param-name="statusId" value="COM_ROLE_COMPLETED"/>
             </link>
         </menu-item>