svn commit: r778107 - in /ofbiz/trunk/applications/party: webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy widget/partymgr/PartyMenus.xml

[hansbak-2]

Author: hansbak
Date: Sun May 24 07:23:52 2009
New Revision: 778107

URL: http://svn.apache.org/viewvc?rev=778107&view=rev
Log:
close buttom was not shown properly

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy?rev=778107&r1=778106&r2=778107&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy Sun May 24 07:23:52 2009
@@ -22,20 +22,11 @@
 import org.ofbiz.base.component.ComponentConfig;
 
 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);
-    }
-    
+
     context.projectMgrExists = ComponentConfig.componentExists("projectmgr");
 }
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=778107&r1=778106&r2=778107&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun May 24 07:23:52 2009
@@ -451,15 +451,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>