Author: hansbak
Date: Sun Apr 19 08:23:31 2009
New Revision: 766436
URL: http://svn.apache.org/viewvc?rev=766436&view=rev
Log:
add extra parameter to communication event portlet to show only internet notes
Modified:
ofbiz/trunk/applications/party/data/PartyPortletData.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=766436&r1=766435&r2=766436&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Sun Apr 19
08:23:31 2009
@@ -98,7 +98,7 @@
<PortalPortlet portalPortletId="MyCommunications" portletName="My
Communications" description="IN and outgoing Communication list of a party"
screenName="MyCommunicationEvents"
screenLocation="component://party/widget/partymgr/CommunicationScreens.xml"
- editFormName="EditPartyId"
editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml"/>
+ editFormName="EditCommPortletParams"
editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml"/>
<PortletPortletCategory portalPortletId="MyCommunications"
portletCategoryId="COMMUNICATIONS"/>
</entity-engine-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=766436&r1=766435&r2=766436&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
Sun Apr 19 08:23:31 2009
@@ -774,10 +774,16 @@
</hyperlink>
</field>
</form>
- <form name="EditPartyId" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml">
+ <form name="EditCommPortletParams" extends="CommonPortletEdit"
extends-resource="component://common/widget/PortletEditForms.xml">
<field name="communicationPartyId"
entry-name="attributeMap.communicationPartyId">
- <lookup target-form-name="LookupPartyName"/>
+ <lookup target-form-name="LookupPartyName"
default-value="${userLogin.partyId}"/>
</field>
+ <field name="internalNotesOnly"
entry-name="attributeMap.internalNotesOnly">
+ <drop-down>
+ <!-- need to be reversed because we want to ignore the
condition statement or not -->
+ <option key="true" description="${uiLabelMap.CommonFalse}"/>
+ <option key="false" description="${uiLabelMap.CommonTrue}"/>
+ </drop-down></field>
<field name="updateButton"><submit/></field>
</form>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=766436&r1=766435&r2=766436&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sun
Apr 19 08:23:31 2009
@@ -818,6 +818,7 @@
<section>
<actions>
<script
location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
+ <set field="internalNotesOnly" from-field="internalNotesOnly"
default-value="false"/>
<set field="partyId" from-field="parameters.partyId"
default-value="${communicationPartyId}"/>
<set field="partyId" from-field="partyId"
default-value="${userLogin.partyId}"/>
<set field="all" from-field="parameters.all"/>
@@ -831,6 +832,8 @@
value="${partyId}"/>
<condition-expr field-name="roleStatusId"
operator="not-equals" value="COM_ROLE_COMPLETED"
ignore="${all}"/>
+ <condition-expr field-name="communicationEventTypeId"
+ operator="equals" value="COMMENT_NOTE"
ignore="${internalNotesOnly}" ignore-if-null="true"/>
</condition-list>
<order-by field-name="-datetimeStarted"/>
</entity-condition>
@@ -871,6 +874,7 @@
<include-form name="ListMyUnknownPartyEmails"
location="component://party/webapp/partymgr/communication/CommForms.xml"/>
</widgets>
</section>
+ <label text="internalNotesOnly:
${internalNotesOnly}"></label>
<label style="h2"
text="${uiLabelMap.PartyEmailsFromKnownOrigin}"></label>
<include-form name="ListPartyCommEvents"
location="component://party/webapp/partymgr/communication/CommForms.xml"/>
<section>
