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 20:34:46 UTC
svn commit: r676398 - in /ofbiz/trunk: applications/party/config/
applications/party/webapp/partymgr/communication/
specialpurpose/mypage/webapp/mypage/WEB-INF/ specialpurpose/mypage/widget/
Author: hansbak
Date: Sun Jul 13 11:34:46 2008
New Revision: 676398
URL: http://svn.apache.org/viewvc?rev=676398&view=rev
Log:
more errors fixing in communications both in party and mypage
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=676398&r1=676397&r2=676398&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Jul 13 11:34:46 2008
@@ -170,6 +170,9 @@
<value xml:lang="th">รายละà¹à¸à¸µà¸¢à¸</value>
<value xml:lang="zh">æè¿°</value>
</property>
+ <property key="EmailfromUnknownParties">
+ <value xml:lang="en">Email unknown parties</value>
+ </property>
<property key="FormFieldTitle_attrName">
<value xml:lang="en">Attr Name</value>
<value xml:lang="fr">Nom d'attribut</value>
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=676398&r1=676397&r2=676398&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sun Jul 13 11:34:46 2008
@@ -327,7 +327,7 @@
</actions>
</form>
- <form name="ListUnknownPartyEmails" extends="ListCommEvents" type="multi"
+ <form name="ListUnknownPartyEmails" extends="ListCommEvents" type="multi" use-row-submit="true" separate-columns="true"
target="deleteCommunicationEvents?communicationEventId=${communicationEventId}&delContentDataResource=Y">
<actions>
<entity-and list-name="commEvents" entity-name="CommunicationEvent">
@@ -335,8 +335,8 @@
<order-by field-name="-lastUpdatedStamp" />
</entity-and>
</actions>
- <field name="_rowSubmit" title="&nbsp;">
- <check />
+ <field name="_rowSubmit" title="S">
+ <check/>
</field>
<field name="deleteSelectedButton" widget-style="smallSubmit">
<submit />
@@ -623,7 +623,7 @@
<field name="note" widget-area-style="fieldWidth200">
<display />
</field>
- <field name="_rowSubmit" title="&nbsp;">
+ <field name="_rowSubmit" title="S">
<check />
</field>
<field name="deleteSelectedButton" widget-style="smallSubmit">
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=676398&r1=676397&r2=676398&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Sun Jul 13 11:34:46 2008
@@ -25,27 +25,27 @@
<link target="FindCommunicationEvents"/>
</menu-item>
<menu-item name="OverView" title="${uiLabelMap.CommonOverview}">
- <condition><not><if-empty field-name="communicationId"/></not></condition>
+ <condition><not><if-empty field-name="communicationEvent"/></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>
+ <condition><not><if-empty field-name="communicationEvent"/></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>
+ <condition><not><if-empty field-name="communicationEvent"/></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>
+ <condition><not><if-empty field-name="communicationEvent"/></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>
+ <condition><not><if-empty field-name="communicationEvent"/></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>
+ <condition><not><if-empty field-name="communicationEvent"/></not></condition>
<link target="ListCommContent?communicationEventId=${parameters.communicationEventId}"/>
</menu-item>
<!-- TODO!
Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml?rev=676398&r1=676397&r2=676398&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Sun Jul 13 11:34:46 2008
@@ -135,6 +135,12 @@
<response name="success" type="view" value="myCommunications"/>
<response name="error" type="view" value="myCommunications"/>
</request-map>
+ <request-map uri="deletePartyCommunicationEvent">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteCommunicationEvent"/>
+ <response name="success" type="view" value="main"/>
+ <response name="error" type="view" value="main"/>
+ </request-map>
<request-map uri="allocateMsgToParty">
<security https="true" auth="true"/>
<event type="simple" path="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="allocateMsgToParty"/>
@@ -147,6 +153,14 @@
<response name="success" type="view" value="myCommunications"/>
<response name="error" type="view" value="ViewCommunicationEvent"/>
</request-map>
+ <request-map uri="deleteCommunicationEvents">
+ <security https="true" auth="true"/>
+ <event type="service-multi" invoke="deleteCommunicationEventWorkEffort"/>
+ <response name="success" type="view"
+ value="main"/>
+ <response name="error" type="view"
+ value="main"/>
+ </request-map>
<!-- PREFERENCES -->
<request-map uri="preferences">
Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=676398&r1=676397&r2=676398&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Jul 13 11:34:46 2008
@@ -112,7 +112,7 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommEventTabBar"/>
+ <include-menu location="component://mypage/widget/MyPageMenus.xml" name="CommEventTabBar"/>
<include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommSubTabBar"/>
<decorator-section-include name="body"/>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=676398&r1=676397&r2=676398&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sun Jul 13 11:34:46 2008
@@ -103,8 +103,9 @@
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventOthers?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</field>
</form>
- <form name="ListMyUnknownPartyEmails" extends="ListMyUnknownPartyEmails" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <form name="ListMyUnknownPartyEmails"
+ extends="ListMyUnknownPartyEmails" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
+ use-row-submit="true">
<field use-when="headerItem.equals("main")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
<hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=main"/>
@@ -115,14 +116,17 @@
<field use-when="headerItem.equals("otherCommunications")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
<hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=other" />
</field>
+ <field name="_rowSubmit" title="S">
+ <check />
+ </field>
<field name="deleteSelectedButton" widget-style="smallSubmit">
<submit />
</field>
</form>
<form name="allocateMsgToPartyForm" extends="allocateMsgToPartyForm" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml">
- <alt-target use-when="headerItem.equals("otherCommunications")" target="allocateOtherMsgToParty"/>
- <alt-target use-when="headerItem.equals("myCommunications")" target="allocateMyMsgToParty"/>
+ <alt-target use-when=""otherCommunications".equals(headerItem)" target="allocateOtherMsgToParty"/>
+ <alt-target use-when=""myCommunications".equals(headerItem)" target="allocateMyMsgToParty"/>
<field name="type"><hidden value="${parameters.type}"/></field>
</form>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=676398&r1=676397&r2=676398&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Jul 13 11:34:46 2008
@@ -140,4 +140,17 @@
<menu-item name="myTime" title="myTime"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
</menu>
+ <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="OverView" title="${uiLabelMap.CommonOverview}">
+ <condition><not><if-empty field-name="communicationEvent"/></not></condition>
+ <link target="ViewCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/>
+ </menu-item>
+ <menu-item name="CommContent" title="${uiLabelMap.CommonContent}">
+ <condition><not><if-empty field-name="communicationEvent"/></not></condition>
+ <link target="ListCommContent?communicationEventId=${parameters.communicationEventId}"/>
+ </menu-item>
+
+ </menu>
+
</menus>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=676398&r1=676397&r2=676398&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Jul 13 11:34:46 2008
@@ -239,11 +239,13 @@
</not>
</condition>
<widgets>
+ <label style="h2" text="Emails from unknown origin"></label>
<include-form
location="component://mypage/widget/MyPageForms.xml"
name="ListMyUnknownPartyEmails" />
</widgets>
</section>
+ <label style="h2" text="Emails from known origin"></label>
<include-form name="ListPartyCommEvents"
location="component://mypage/widget/MyPageForms.xml" />
</screenlet>
@@ -333,7 +335,10 @@
<widgets>
<section>
<condition>
- <if-empty field-name="communicationEvent.partyIdFrom" />
+ <and>
+ <if-empty field-name="communicationEvent.partyIdFrom" />
+ <if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_UNKNOWN_PARTY"/>
+ </and>
</condition>
<widgets>
<screenlet>