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 2008/07/13 15:21:42 UTC
svn commit: r676317 - in /ofbiz/trunk/applications/party:
webapp/partymgr/WEB-INF/controller.xml
webapp/partymgr/communication/CommForms.xml
webapp/partymgr/communication/CommMenus.xml
widget/partymgr/CommunicationScreens.xml
Author: hansbak
Date: Sun Jul 13 06:21:41 2008
New Revision: 676317
URL: http://svn.apache.org/viewvc?rev=676317&view=rev
Log:
new option: list all emails from an unknown emailaddress
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=676317&r1=676316&r2=676317&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sun Jul 13 06:21:41 2008
@@ -694,6 +694,19 @@
<response name="success" type="view" value="ListLookupCommEvents"/>
<response name="error" type="view" value="ListLookupCommEvents"/>
</request-map>
+ <request-map uri="deleteCommunicationEvents">
+ <security https="true" auth="true"/>
+ <event type="service-multi" invoke="deleteCommunicationEventWorkEffort"/>
+ <response name="success" type="view"
+ value="ListUnknownPartyComms"/>
+ <response name="error" type="view"
+ value="ListUnknownPartyComms"/>
+ </request-map>
+ <request-map uri="listUnknownPartyComms">
+ <security https="true" auth="true" />
+ <response name="success" type="view" value="ListUnknownPartyComms" />
+ </request-map>
+
<request-map uri="deletePartyCommunicationEvent">
<security https="true" auth="true"/>
@@ -1089,6 +1102,7 @@
<view-map name="ListCommContent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListCommContent"/>
<view-map name="PendingCommunications" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#PendingCommunications"/>
<view-map name="ListPartyCommEvents" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListPartyCommEvents"/>
+ <view-map name="ListUnknownPartyComms" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListUnknownPartyComms"/>
<view-map name="ListLookupCommEvents" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListLookupCommEvents"/>
<view-map name="FindCommunicationEvents" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#FindCommunicationEvents"/>
<view-map name="EditCommunicationEvent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditCommunicationEvent"/>
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=676317&r1=676316&r2=676317&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sun Jul 13 06:21:41 2008
@@ -327,6 +327,22 @@
</actions>
</form>
+ <form name="ListUnknownPartyEmails" extends="ListCommEvents" type="multi"
+ target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&delContentDataResource=Y">
+ <actions>
+ <entity-and list-name="commEvents" entity-name="CommunicationEvent">
+ <field-map field-name="statusId" value="COM_UNKNOWN_PARTY"/>
+ <order-by field-name="-lastUpdatedStamp" />
+ </entity-and>
+ </actions>
+ <field name="_rowSubmit" title="&nbsp;">
+ <check />
+ </field>
+ <field name="deleteSelectedButton" widget-style="smallSubmit">
+ <submit />
+ </field>
+ </form>
+
<form name="ListChildCommEvents" type="list" extends="ListCommEvents" paginate-target="EditCommunicationEvent">
<actions>
<entity-condition entity-name="CommunicationEvent" list-name="commEvents">
@@ -587,8 +603,8 @@
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
- <form name="ListUnknownPartyEmails" type="multi" use-row-submit="true"
- title="Email List" list-name="commEventsUnknown"
+ <form name="ListMyUnknownPartyEmails" type="multi" use-row-submit="true"
+ title="Email List unknown parties" list-name="commEventsUnknown"
default-widget-style="tabletext" default-tooltip-style="tabletext"
target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&delContentDataResource=Y"
default-entity-name="CommunicationEvent"
@@ -604,18 +620,9 @@
<field name="entryDate">
<display description="${bsh:entryDate.toString().substring(0,16)}" />
</field>
- <!--
- field name="statusId"><display-entity entity-name="StatusItem"
- description="${description}"/></field
- -->
<field name="note" widget-area-style="fieldWidth200">
<display />
</field>
- <!--
- field name="delete" widget-style="buttontext"><hyperlink
- description="delete"
- target="deleteCommunicationEvent?communicationEventId=${communicationEventId}&delContentDataResource=Y"/></field
- -->
<field name="_rowSubmit" title="&nbsp;">
<check />
</field>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=676317&r1=676316&r2=676317&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Sun Jul 13 06:21:41 2008
@@ -20,22 +20,32 @@
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
<menu name="CommEventTabBar" default-selected-style="selected" type="simple"
menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="Find" title="${uiLabelMap.CommonFind}">
+ <condition><if-compare field-name="tabButtonItem" operator="not-equals" value="Find"/></condition>
+ <link target="FindCommunicationEvents"/>
+ </menu-item>
<menu-item name="OverView" title="${uiLabelMap.CommonOverview}">
+ <condition><not><if-empty field-name="communicationId"/></not></condition>
<link target="ViewCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="CommunicationEvent" title="${uiLabelMap.PartyCommEvent}">
+ <condition><not><if-empty field-name="communicationId"/></not></condition>
<link target="EditCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommPurposes" title="${uiLabelMap.PartyEventPurpose}">
+ <condition><not><if-empty field-name="communicationId"/></not></condition>
<link target="UpdateCommPurposes?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommRoles" title="${uiLabelMap.PartyRoles}">
+ <condition><not><if-empty field-name="communicationId"/></not></condition>
<link target="UpdateCommRoles?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="UpdateCommWorkEfforts" title="${uiLabelMap.PartyCommWorkEfforts}">
+ <condition><not><if-empty field-name="communicationId"/></not></condition>
<link target="ListCommWorkEfforts?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<menu-item name="CommContent" title="${uiLabelMap.CommonContent}">
+ <condition><not><if-empty field-name="communicationId"/></not></condition>
<link target="ListCommContent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<!-- TODO!
@@ -43,6 +53,9 @@
<link target="ListCommCustRequests?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</menu-item>
-->
+ <menu-item name="ListUnknownPartyComms" title="${uiLabelMap.EmailfromUnknownParties}">
+ <link target="listUnknownPartyComms"/>
+ </menu-item>
</menu>
<menu name="CommFindTabBar" default-menu-item-name="find" type="simple">
<menu-item name="find" title="${uiLabelMap.CommonFind}">
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=676317&r1=676316&r2=676317&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sun Jul 13 06:21:41 2008
@@ -96,12 +96,40 @@
</widgets>
</section>
</screen>
+ <!-- List comm events from incoming email of which the parties are unknown, with the option to mass delete -->
+ <screen name="ListUnknownPartyComms">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleListUnknownPartyComms"/>
+ <set field="tabButtonItem" value="ListUnknownPartyComms"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/>
+ </condition>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleListUnknownPartyComms}">
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListUnknownPartyEmails"/>
+ </screenlet>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="FindCommunicationEvents">
<section>
<actions>
<set field="titleProperty" value="PageTitleFindCommunicationEvents"/>
<set field="headerItem" value="comm"/>
- <set field="tabButtonItem" value="find"/>
+ <set field="tabButtonItem" value="Find"/>
<set field="entityName" value="CommunicationEvent"/>
</actions>
<widgets>
@@ -112,16 +140,9 @@
<if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
+ <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommEventTabBar"/>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
- <section>
- <condition>
- <not><if-empty field-name="partyId"/></not>
- </condition>
- <widgets>
- <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
- </widgets>
- </section>
<include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/>
</decorator-section>
<decorator-section name="search-options">
@@ -168,7 +189,10 @@
<widgets>
<section>
<condition>
- <if-empty field-name="communicationEvent.partyIdFrom"/>
+ <and>
+ <if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_UNKNOWN_PARTY"/>
+ <if-empty field-name="communicationEvent.partyIdFrom"/>
+ </and>
</condition>
<widgets>
<screenlet>