You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/05/29 08:11:07 UTC
svn commit: r779856 - in /ofbiz/trunk/applications/party:
webapp/partymgr/WEB-INF/actions/communication/
webapp/partymgr/communication/ widget/partymgr/
Author: hansbak
Date: Fri May 29 06:11:07 2009
New Revision: 779856
URL: http://svn.apache.org/viewvc?rev=779856&view=rev
Log:
rules in communications mopre free than in my communications, fixed problem reported by aswath in mailing list
Removed:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
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=779856&r1=779855&r2=779856&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Fri May 29 06:11:07 2009
@@ -377,7 +377,7 @@
<field name="subject">
<hyperlink description="${subject}[${communicationEventId}]" target="ViewCommunicationEvent">
<parameter param-name="communicationEventId"/>
- <parameter param-name="partyId"/>
+ <parameter param-name="partyIdFrom" from-field="partyId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=779856&r1=779855&r2=779856&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Fri May 29 06:11:07 2009
@@ -367,20 +367,18 @@
<set field="titleProperty" value="PageTitleEditCommunication"/>
<set field="my" from-field="parameters.my" default-value=""/>
<entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
- <set field="partyIdFrom" from-field="parameters.partyIdFrom" default-value="parameters.userLogin.partyId"/>
+ <set field="partyIdFrom" from-field="communicationEvent.partyIdFrom" default-value="${userLogin.partyId}"/>
<set field="parameters.communicationEventTypeId" from-field="parameters.communicationEventTypeId" default-value="${communicationEvent.communicationEventTypeId}"/>
- <!--script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/-->
</actions>
<widgets>
<decorator-screen name="Common${my}CommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section><!-- Email -->
<condition>
- <or><!-- have for e-mails a special form -->
+ <and>
<if-compare field="parameters.communicationEventTypeId" operator="equals" value="EMAIL_COMMUNICATION"/>
- <if-compare field="parameters.communicationEventTypeId" operator="equals" value="AUTO_EMAIL_COMM"/>
- </or>
+ <if-compare field="my" operator="equals" value="My"/>
+ </and>
</condition>
<widgets>
<section>
@@ -415,7 +413,10 @@
</section>
<section>
<condition><!-- internal note -->
- <if-compare field="parameters.communicationEventTypeId" operator="equals" value="COMMENT_NOTE"/>
+ <and>
+ <if-compare field="parameters.communicationEventTypeId" operator="equals" value="COMMENT_NOTE"/>
+ <if-compare field="my" operator="equals" value="My"/>
+ </and>
</condition>
<widgets>
<section>
@@ -448,12 +449,15 @@
</widgets>
</section>
<section>
- <condition><!-- others -->
- <and>
- <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="COMMENT_NOTE"/>
- <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="EMAIL_COMMUNICATION"/>
- <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="AUTO_EMAIL_COMM"/>
- </and>
+ <condition><!-- others and general communications in party-->
+ <or>
+ <if-empty field="my"/>
+ <and>
+ <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="COMMENT_NOTE"/>
+ <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="EMAIL_COMMUNICATION"/>
+ <if-compare field="parameters.communicationEventTypeId" operator="not-equals" value="AUTO_EMAIL_COMM"/>
+ </and>
+ </or>
</condition>
<widgets>
<screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent} ${parameters.communicationEventId}">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=779856&r1=779855&r2=779856&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri May 29 06:11:07 2009
@@ -559,24 +559,11 @@
<menu-item name="new" title="${uiLabelMap.PartyNewCommunication}">
<link target="EditCommunicationEvent"/>
</menu-item>
- <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
- <link target="EditCommunicationEvent">
- <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/>
- <parameter param-name="partyIdFrom" from-field="parameters.userLogin.partyId"/>
- </link>
- </menu-item>
- <menu-item name="newInternalNote" title="${uiLabelMap.PartyNewInternalNote}">
- <link target="EditCommunicationEvent">
- <parameter param-name="communicationEventTypeId" value="COMMENT_NOTE"/>
- <parameter param-name="partyIdFrom" from-field="parameters.userLogin.partyId"/>
- </link>
- </menu-item>
<menu-item name="reply" title="${uiLabelMap.PartyReply}">
<condition>
<and>
<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>
@@ -590,7 +577,6 @@
<and>
<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>