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/12 17:29:36 UTC
svn commit: r676187 - in /ofbiz/trunk:
framework/common/config/CommonUiLabels.xml
specialpurpose/mypage/widget/CommonScreens.xml
specialpurpose/mypage/widget/MyPageForms.xml
specialpurpose/mypage/widget/MyPageScreens.xml
Author: hansbak
Date: Sat Jul 12 08:29:36 2008
New Revision: 676187
URL: http://svn.apache.org/viewvc?rev=676187&view=rev
Log:
makes these new coms screens working in the my page envirionment
Modified:
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=676187&r1=676186&r2=676187&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sat Jul 12 08:29:36 2008
@@ -3991,6 +3991,9 @@
<value xml:lang="zh_CN">(è¦çä¸é¢çéæ©)</value>
<value xml:lang="zh">(è¦çä¸è¿°éæ©ä¸çä»»ä½ä¸ä¸ªã)</value>
</property>
+ <property key="CommonOverview">
+ <value xml:lang="en">Overview</value>
+ </property>
<property key="CommonPage">
<value xml:lang="ar">صÙØØ©</value>
<value xml:lang="en">Page</value>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=676187&r1=676186&r2=676187&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sat Jul 12 08:29:36 2008
@@ -113,88 +113,10 @@
<set field="headerItem" value="comm"/>
<set field="communicationEventId" from-field="parameters.communicationEventId"/>
<entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
- <set field="okayToUpdate" value="true" type="Boolean" global="true"/>
</actions>
<widgets>
- <section>
- <condition>
- <and>
- <not><if-empty field-name="communicationEvent.statusId"/></not>
- <or>
- <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_COMPLETE"/>
- <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_RESOLVED"/>
- <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_REFERRED"/>
- <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_CANCELLED"/>
- </or>
- </and>
- </condition>
- <actions>
- <set field="okayToUpdate" value="false" type="Boolean" global="true"/>
- </actions>
- <widgets/>
- </section>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <or>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
- <and><!-- everybody can see his own communication events -->
- <not><if-empty field-name="communicationEvent"/></not>
- <or>
- <if-compare field-name="communicationEvent.partyIdFrom" operator="equals" value="${userLogin.partyId}"/>
- <if-compare field-name="communicationEvent.partyIdTo" operator="equals" value="${userLogin.partyId}"/>
- </or>
- </and>
- <if-empty field-name="communicationEvent"/><!-- new one -->
- </or>
- </condition>
- <widgets>
- <section>
- <condition>
- <not><if-empty field-name="partyId"/></not>
- </condition>
- <widgets>
- <container style="button-bar button-style-2">
- <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app"
- text="${uiLabelMap.AccountingBillingAccount}"/>
- <section>
- <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition>
- <widgets>
- <link target="/ordermgr/control/searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&viewIndex=1&viewSize=20" url-mode="inter-app"
- text="${uiLabelMap.OrderOrders}"/>
- </widgets>
- </section>
- <section>
- <condition><if-has-permission permission="ORDERMGR" action="_CREATE"/></condition>
- <widgets>
- <link target="/ordermgr/control/checkinits?partyId=${partyId}" url-mode="inter-app"
- text="${uiLabelMap.OrderNewOrder}"/>
- </widgets>
- </section>
- <section>
- <condition><if-has-permission permission="ACCOUNTING" action="_VIEW"/></condition>
- <widgets>
- <link target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdTo=${partyId}" url-mode="inter-app"
- text="${uiLabelMap.AccountingPaymentsSent}"/>
- <link target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdFrom=${partyId}" url-mode="inter-app"
- text="${uiLabelMap.AccountingPaymentsReceived}"/>
- </widgets>
- </section>
- </container>
- </widgets>
- </section>
- <section>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
+ <decorator-section name="body"/>
</decorator-screen>
</widgets>
</section>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=676187&r1=676186&r2=676187&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sat Jul 12 08:29:36 2008
@@ -90,7 +90,9 @@
<field name="updateButton"><submit/></field>
</form>
- <form name="ListPartyCommEvents" extends="ListPartyCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" >
+ <form name="ListPartyCommEvents" extends="ListCommEvents" 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">
+
<field use-when="headerItem.equals("main")" name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</field>
@@ -101,4 +103,8 @@
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEventOthers?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</field>
</form>
+
+ <form name="allocateMsgToPartyForm" extends="allocateMsgToPartyForm" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml">
+ <alt-target use-when="!headerItem.equals("main")" target="allocateMsgToPartyKey"/>
+ </form>
</forms>
\ 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=676187&r1=676186&r2=676187&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sat Jul 12 08:29:36 2008
@@ -189,12 +189,37 @@
<section>
<actions>
<set field="partyId" from-field="userLogin.partyId" />
+ <entity-condition entity-name="CommunicationEvent" list-name="commEvents">
+ <condition-list combine="and">
+ <condition-expr field-name="statusId" operator="not-equals" value="COM_UNKNOWN_PARTY"/>
+ <condition-list combine="or">
+ <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/>
+ <condition-expr field-name="partyIdTo" operator="equals" value="${partyId}"/>
+ </condition-list>
+ </condition-list>
+ <order-by field-name="-lastUpdatedStamp"/>
+ </entity-condition>
+ <entity-condition entity-name="CommunicationEvent" list-name="commEventsUnknown">
+ <condition-list combine="and">
+ <condition-expr field-name="statusId" operator="equals" value="COM_UNKNOWN_PARTY"/>
+ <condition-expr field-name="partyIdTo" operator="equals" value="${partyId}"/>
+ </condition-list>
+ <order-by field-name="-lastUpdatedStamp"/>
+ </entity-condition>
</actions>
<widgets>
<screenlet title="${uiLabelMap.MyCommunications}" navigation-menu-name="MyCommunicationsMenu"
navigation-form-name="ListPartyCommEvents" name="myComms">
<include-menu name="MyCommunicationsMenu"
location="component://mypage/widget/MyPageMenus.xml" />
+ <section>
+ <condition>
+ <not><if-empty field-name="commEventsUnknown"/></not>
+ </condition>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListUnknownPartyEmails"/>
+ </widgets>
+ </section>
<include-form name="ListPartyCommEvents"
location="component://mypage/widget/MyPageForms.xml" />
</screenlet>