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/09/24 09:26:17 UTC
svn commit: r698445 - in /ofbiz/trunk:
applications/party/webapp/partymgr/communication/CommForms.xml
specialpurpose/mypage/widget/MyPageScreens.xml
specialpurpose/projectmgr/widget/Menus.xml
Author: hansbak
Date: Wed Sep 24 00:26:16 2008
New Revision: 698445
URL: http://svn.apache.org/viewvc?rev=698445&view=rev
Log:
menu enhancement and 'done page' corrections
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.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=698445&r1=698444&r2=698445&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Wed Sep 24 00:26:16 2008
@@ -22,6 +22,7 @@
<form name="EditCommEvent" type="single" target="updateCommunicationEvent" default-map-name="communicationEvent">
<alt-target target="createCommunicationEvent" use-when="communicationEvent==null"/>
+ <field name="donePage" ><hidden value="${parameters.donePage}"/></field>
<field name="communicationEventId" use-when="communicationEvent!=null"><display/></field>
<field name="parentCommEventId" position="2">
<lookup target-form-name="LookupCommEvent">
@@ -606,7 +607,7 @@
<form name="ListMyUnknownPartyEmails" type="multi" use-row-submit="true"
title="Email List unknown parties" list-name="commEventsUnknown"
- target="deleteCommunicationEvents" default-entity-name="CommunicationEvent"
+ target="deleteCommunicationEvents?donePage=${parameters.donePage}" default-entity-name="CommunicationEvent"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<row-actions>
<set field="subject" from-field="subject" default-value="${uiLabelMap.PartyNoSubject}"/>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=698445&r1=698444&r2=698445&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Wed Sep 24 00:26:16 2008
@@ -273,7 +273,7 @@
<screen name="ViewCommunicationEvent">
<section>
<actions>
- <set field="donePage" value="ViewCommunicationEvent"/>
+ <set field="donePage" value="${parameters.donePage}"/>
<set field="titleProperty" value="PageTitleViewCommunication" />
<set field="tabButtonItem" value="OverView" />
<set field="parentCommEventId" from-field="parameters.parentCommEventId" />
@@ -318,7 +318,7 @@
<label style="h1" text="${uiLabelMap.CommonRelatedInformation}" />
<section>
<actions>
- <set field="donePage" value="ViewCommunicationEvent"/>
+ <set field="donePage" value="${parameters.donePage}"/>
</actions>
<widgets>
<screenlet title="${uiLabelMap.PartyCommEventRoles}">
@@ -329,7 +329,7 @@
</section>
<section>
<actions>
- <set field="donePage" value="ViewCommunicationEvent"/>
+ <set field="donePage" value="${parameters.donePage}"/>
</actions>
<widgets>
<screenlet title="${uiLabelMap.PartyCommContent}">
@@ -378,7 +378,6 @@
<set field="tabButtonItem" value="ViewRequest"/>
<set field="headerItem" value="request"/>
<set field="titleProperty" value="PageTitleViewRequest"/>
- <!--<set field="headerItem" value="Shopping List"/>-->
<set field="showRequestManagementLinks" value="Y"/>
<set field="custRequestId" from-field="parameters.custRequestId"/>
<entity-one entity-name="CustRequest" value-name="custRequest"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=698445&r1=698444&r2=698445&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Wed Sep 24 00:26:16 2008
@@ -296,6 +296,7 @@
<not><if-empty field-name="workEffort"/></not>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_CANCELLED"/>
<if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_ON_HOLD"/>
+ <if-compare field-name="workEffort.currentStatusId" operator="not-equals" value="PTS_COMPLETED"/>
</and>
</condition>
<link target="setTaskStatus?workEffortId=${workEffortId}&currentStatusId=PTS_ON_HOLD"/>