Author: hansbak
Date: Sat May 23 04:06:03 2009 New Revision: 777792 URL: http://svn.apache.org/viewvc?rev=777792&view=rev Log: some more corrections on commevent functionkeys and forward Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.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=777792&r1=777791&r2=777792&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 Sat May 23 04:06:03 2009 @@ -40,8 +40,8 @@ <field-map field-name="communicationEventId" from-field="parameters.origCommEventId"/> </entity-one> <clear-field field="newEntity.communicationEventId"/> - <clear-field field="newEntity.partyIdFrom"/> <clear-field field="newEntity.partyIdTo"/> + <set field="newEntity.partyIdFrom" from-field="parameters.partyIdFrom"/> <set field="newEntity.subject" value="Forw: ${newEntity.subject}"/> </if-not-empty> </if-compare> 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=777792&r1=777791&r2=777792&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sat May 23 04:06:03 2009 @@ -758,6 +758,7 @@ <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300"> <hyperlink description="${subject}" target="ViewCommunicationEvent"> <parameter param-name="communicationEventId"/> + <parameter param-name="partyId"/> <parameter param-name="my" value="My"/> </hyperlink> </field> @@ -831,6 +832,7 @@ <field name="subject"> <hyperlink description="${subject}" target="EditCommunicationEvent"> <parameter param-name="communicationEventId"/> + <parameter param-name="partyId"/> <parameter param-name="my"/> </hyperlink> </field> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=777792&r1=777791&r2=777792&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sat May 23 04:06:03 2009 @@ -393,7 +393,7 @@ <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="partyIdFrom" from-field="partyId"/> <parameter param-name="my" value="My"/> <parameter param-name="statusId" value="COM_PENDING"/> <parameter param-name="partyIdTo" from-field="communicationEvent.partyIdFrom"/> @@ -424,6 +424,7 @@ <if-compare field="communicationEvent.statusId" operator="not-equals" value="COM_PENDING"/> <if-has-permission permission="ORDERMGR_CRQ_CREATE"/> <if-compare field="projectMgrExists" operator="equals" value="false"/> + <if-compare field="communicationEvent.statusId" operator="equals" value="COM_ENTERED"/> </and> </condition> <link target="editRequestFromCommEvent"> @@ -439,6 +440,7 @@ <if-compare field="communicationEvent.statusId" operator="not-equals" value="COM_PENDING"/> <if-has-permission permission="ORDERMGR_CRQ_CREATE"/> <if-compare field="projectMgrExists" operator="equals" value="true"/> + <if-compare field="communicationEvent.statusId" operator="equals" value="COM_ENTERED"/> </and> </condition> <link target="newrequest"> @@ -452,6 +454,7 @@ <not><if-empty field="communicationEvent"/></not> <if-compare field="myCommunicationEventRole.roleStatusId" 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"> @@ -572,6 +575,7 @@ <not><if-empty field="parameters.communicationEventId"/></not> <not><if-empty field="communicationEvent.partyIdFrom"/></not> <if-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/> + <if-compare field="communicationEvent.statusId" operator="not-equals" value="COM_UNKNOWN_PARTY"/> </and> </condition> <link target="EditCommunicationEvent"> @@ -584,6 +588,7 @@ <not><if-empty field="parameters.communicationEventId"/></not> <not><if-empty field="communicationEvent.partyIdFrom"/></not> <if-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/> + <if-compare field="communicationEvent.statusId" operator="not-equals" value="COM_UNKNOWN_PARTY"/> </and> </condition> <link target="EditCommunicationEvent"> @@ -596,6 +601,7 @@ <not><if-empty field="parameters.communicationEventId"/></not> <not><if-empty field="communicationEvent.partyIdFrom"/></not> <if-has-permission permission="ORDERMGR_CRQ_CREATE"/> + <if-compare field="communicationEvent.statusId" operator="equals" value="COM_ENTERED"/> </and> </condition> <link target="editRequestFromCommEvent"> |
Free forum by Nabble | Edit this page |