Author: hansbak
Date: Mon Jan 12 19:15:49 2009
New Revision: 734014
URL: http://svn.apache.org/viewvc?rev=734014&view=rev
Log:
another update of myportal to copy the functions of mypage
Modified:
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=734014&r1=734013&r2=734014&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
(original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Mon
Jan 12 19:15:49 2009
@@ -165,10 +165,10 @@
</simple-method>
<simple-method method-name="getToNextDonePage" short-description="return
the requestValue 'donePage' as a resultcode to the controller">
- <set field="donePage" from-field="parameters.donePage"
default-value="${parameters.DONE_PAGE}"/>
- <if-not-empty field="donePage">
- <log level="info" message="Next request: ${donePage}"/>
- <return response-code="${donePage}"/>
+ <set field="portalPageId" from-field="parameters.portalPageId"/>
+ <if-not-empty field="portalPageId">
+ <log level="info" message="Next request: ${portalPageId}"/>
+ <return response-code="parameters.portalPageId"/>
<else>
<log level="info" message="Next 'donePage' variable not
provided, returning 'error'"/>
<return response-code="error"/>
Modified:
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=734014&r1=734013&r2=734014&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
Mon Jan 12 19:15:49 2009
@@ -40,8 +40,8 @@
<request-map uri="updateTimesheet">
<security https="true" auth="true"/>
<event type="service-multi" invoke="updateTimeEntryByWorkeffort"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="main"/>
+ <response name="success" type="view" value="getToNextDonePage"/>
+ <response name="error" type="view" value="getToNextDonePage"/>
</request-map>
<request-map uri="updateTimesheetKey">
<security https="true" auth="true"/>
@@ -127,28 +127,6 @@
<response name="error" type="view" value="main"/>
</request-map>
- <!-- PREFERENCES -->
- <request-map uri="preferences">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="preferences"/>
- </request-map>
- <request-map uri="updatePreferences">
- <security https="true" auth="true"/>
- <event invoke="updatePreferences" path="org/ofbiz/myportal/Events.xml"
type="simple"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="preferences"/>
- </request-map>
- <request-map uri="custPreferences">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="custPreferences"/>
- </request-map>
- <request-map uri="updateCustPreferences">
- <security https="true" auth="true"/>
- <event invoke="updateCustPreferences"
path="org/ofbiz/myportal/Events.xml" type="simple"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="custPreferences"/>
- </request-map>
-
<!-- OTHER COMMUNICATIONS -->
<request-map uri="otherCommunications">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=734014&r1=734013&r2=734014&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Mon Jan 12
19:15:49 2009
@@ -96,7 +96,7 @@
<screen name="CommonTimesheetDecorator">
<section>
<actions>
- <set field="headerItem" value="${parameters.donePage}"/>
+ <set field="headerItem" value="${parameters.portalPageId}"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -109,7 +109,7 @@
<screen name="CommonCommunicationEventDecorator">
<section>
<actions>
- <set field="headerItem" value="${parameters.donePage}"/>
+ <set field="headerItem" value="${parameters.portalPageId}"/>
<entity-one entity-name="CommunicationEvent"
value-name="commEvent">
<field-map field-name="communicationEventId"
env-name="parameters.communicationEventId"/>
</entity-one>
@@ -129,7 +129,7 @@
<screen name="CommonMyTaskDecorator">
<section>
<actions>
- <set field="headerItem" value="${parameters.donePage}"/>
+ <set field="headerItem" value="${parameters.portalPageId}"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -189,5 +189,40 @@
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen>
+
+ <screen name="MyCompanyComms">
+ <section>
+ <actions>
+ <set field="portalPageId" from-field="portalPageId"
default-value="parameters.portalPageId"/>
+ <set field="headerItem" from-field="parameters.portalPageId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-screen name="MyCompanyComms"
+
location="component://myportal/widget/MyPortalScreens.xml" />
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="MyTimesheet">
+ <section>
+ <actions>
+ <set field="headerItem" value="myTimesheet" />
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-screen name="MyTimesheet"
+
location="component://myportal/widget/MyPortalScreens.xml" />
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=734014&r1=734013&r2=734014&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Mon Jan 12
19:15:49 2009
@@ -62,7 +62,7 @@
<order-by field-name="actualStartDate"/>
</entity-condition>
</actions>
- <alt-target use-when="!headerItem.equals("main")"
target="deleteEventKey"/>
+ <alt-target use-when="headerItem.equals("main")"
target="deleteEventKey"/>
<field name="workEffortId"><hidden/></field>
<field name="workEffortName"
title="${uiLabelMap.WorkEffortEventName}"><display/></field>
<field name="description"
title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -71,7 +71,7 @@
</form>
<form name="newEvent" type="single" target="createEvent">
- <field name="donePage"><hidden/></field>
+ <field name="portalPageId"><hidden/></field>
<field name="workEffortTypeId"><hidden value="COMPANY_EVENT"/></field>
<field name="currentStatusId"><hidden value="_NA_"/></field>
<field name="workEffortName"
title="${uiLabelMap.WorkEffortEventName}"><text/></field>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=734014&r1=734013&r2=734014&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Mon Jan 12
19:15:49 2009
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd";>
<menu name="MyCompanyCommsMenu">
<menu-item name="newEvent" title="${uiLabelMap.WorkEffortNewEvent}">
- <link target="newEvent?donePage=${parameters.donePage}"/>
+ <link target="newEvent?portalPageId=${parameters.portalPageId}"/>
</menu-item>
</menu>
<menu name="communicationsMenu">
@@ -31,20 +31,20 @@
<if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
</condition>
<link
-
target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&donePage=${parameters.donePage}&partyIdFrom=${userLogin.partyId}&statusId=COM_PENDING"/>
+
target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&portalPageId=${parameters.portalPageId}&partyIdFrom=${userLogin.partyId}&statusId=COM_PENDING"/>
</menu-item>
<menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}">
<condition>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
</condition>
<link
-
target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&donePage=${parameters.donePage}"
/>
+
target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&portalPageId=${parameters.portalPageId}"
/>
</menu-item>
<menu-item name="openEvents" title="${uiLabelMap.OpenEvents}">
<condition>
<if-compare field-name="parameters.all" operator="equals"
value="true" />
</condition>
- <link
target="${parameters.donePage}?donePage=${parameters.donePage}&all=false" />
+ <link
target="showPortalPage?portalPageId=${parameters.portalPageId}&all=false" />
</menu-item>
<menu-item name="allOtherEvents" title="${uiLabelMap.AllEvents}">
<condition>
@@ -53,7 +53,7 @@
<if-empty field-name="parameters.all"/>
</or>
</condition>
- <link
target="${parameters.donePage}?donePage=${parameters.donePage}&all=true" />
+ <link
target="showPortalPage?portalPageId=${parameters.portalPageId}&all=true" />
</menu-item>
</menu>
@@ -90,19 +90,19 @@
<if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
</and>
</condition>
- <link
target="EditCommunicationEvent?donePage=${parameters.donePage}"/>
+ <link
target="EditCommunicationEvent?portalPageId=${parameters.portalPageId}"/>
</menu-item>
<menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
<condition>
<if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
</condition>
- <link
target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&donePage=${parameters.donePage}&partyIdFrom=${userLogin.partyId}&statusId=COM_PENDING"/>
+ <link
target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&portalPageId=${parameters.portalPageId}&partyIdFrom=${userLogin.partyId}&statusId=COM_PENDING"/>
</menu-item>
<menu-item name="newInternalNote"
title="${uiLabelMap.PartyNewInternalNote}">
<condition>
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
</condition>
- <link
target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&donePage=${parameters.donePage}"/>
+ <link
target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&portalPageId=${parameters.portalPageId}"/>
</menu-item>
<menu-item name="reply" title="${uiLabelMap.PartyReply}">
<condition>
@@ -114,7 +114,7 @@
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
</and>
</condition>
- <link
target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&parentCommEventId=${parameters.communicationEventId}&donePage=${parameters.donePage}"/>
+ <link
target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&parentCommEventId=${parameters.communicationEventId}&portalPageId=${parameters.portalPageId}"/>
</menu-item>
<menu-item name="forward" title="${uiLabelMap.Forward}">
<condition>
@@ -126,7 +126,7 @@
<if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
</and>
</condition>
- <link
target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&originalCommEventId=${parameters.communicationEventId}&donePage=${parameters.donePage}"/>
+ <link
target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&originalCommEventId=${parameters.communicationEventId}&portalPageId=${parameters.portalPageId}"/>
</menu-item>
<menu-item name="createRequestFromCommEvent"
title="${uiLabelMap.PartyCreateRequestFromCommEvent}">
<condition>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=734014&r1=734013&r2=734014&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Mon Jan 12
19:15:49 2009
@@ -23,8 +23,8 @@
<screen name="newEvent">
<section>
<actions>
- <set field="donePage" from-field="donePage"
default-value="myCompanyComms"/>
- <set field="headerItem" from-field="parameters.donePage"/>
+ <set field="portalPageId" from-field="parameters.portalPageId"
default-value="myCompanyComms"/>
+ <set field="headerItem" from-field="parameters.portalPageId"/>
</actions>
<widgets>
<section>
@@ -46,7 +46,7 @@
<screen name="MyTimesheet">
<section>
<actions>
- <set field="donePage" value="parameters.portalPageId"/>
+ <set field="portalPageId" value="parameters.portalPageId"/>
<script
location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
</actions>
<widgets>
@@ -94,7 +94,7 @@
<screen name="MyTasks">
<section>
<actions>
- <set field="donePage" value="myTasks"/>
+ <set field="portalPageId" value="myTasks"/>
<entity-and entity-name="WorkEffortAndPartyAssign"
list-name="tasks" filter-by-date="true">
<field-map field-name="partyId"
env-name="userLogin.partyId" />
@@ -166,7 +166,7 @@
<screen name="MyCompanyComms">
<section>
<actions>
- <set field="donePage" from-field="donePage"
default-value="myCompanyComms"/>
+ <set field="portalPageId" from-field="parameters.portalPageId"
default-value="myCompanyComms"/>
</actions>
<widgets>
<screenlet title="${uiLabelMap.CompanyEvents}"
navigation-menu-name="MyCompanyCommsMenu" name="companyEvents"
collapsible="true">
@@ -180,7 +180,7 @@
<section>
<actions>
<set field="partyId" from-field="userLogin.partyId" />
- <set field="donePage" value="myCommunications"/>
+ <set field="portalPageId" value="myCommunications"/>
</actions>
<widgets>
<include-screen name="Communications"/>
@@ -272,7 +272,7 @@
<screen name="OtherCommunications">
<section>
<actions>
- <set field="donePage" value="otherCommunications"/>
+ <set field="portalPageId" value="otherCommunications"/>
<entity-and list-name="emailOwners"
entity-name="PartyRelationship" filter-by-date="true">
<field-map field-name="partyIdFrom"
value="${userLogin.partyId}" />
<field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN"
/>
@@ -295,12 +295,12 @@
<screen name="ViewCommunicationEvent">
<section>
<actions>
- <set field="donePage" value="${parameters.donePage}"/>
+ <set field="portalPageId" value="${parameters.portalPageId}"/>
<set field="titleProperty" value="PageTitleViewCommunication"
/>
<set field="tabButtonItem" value="OverView" />
<set field="parentCommEventId"
from-field="parameters.parentCommEventId" />
<entity-one entity-name="CommunicationEvent"
value-name="communicationEvent" />
- <set field="headerItem" value="donePage" />
+ <set field="headerItem" from-field="parameters.portalPageId" />
</actions>
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator"
@@ -328,7 +328,7 @@
<field-map
field-name="communicationEventId"
env-name="communicationEvent.parentCommEventId" />
</entity-one>
- <set field="donePage"
from-field="parameters.donePage"/>
+ <set field="portalPageId"
from-field="parameters.portalPageId"/>
</actions>
<widgets>
<include-screen name="commEvent"
@@ -340,7 +340,7 @@
<label style="h1"
text="${uiLabelMap.CommonRelatedInformation}" />
<section>
<actions>
- <set field="donePage"
value="${parameters.donePage}"/>
+ <set field="portalPageId"
value="${parameters.portalPageId}"/>
</actions>
<widgets>
<screenlet
title="${uiLabelMap.PartyCommEventRoles}">
@@ -351,7 +351,7 @@
</section>
<section>
<actions>
- <set field="donePage"
value="${parameters.donePage}"/>
+ <set field="portalPageId"
value="${parameters.portalPageId}"/>
</actions>
<widgets>
<screenlet
title="${uiLabelMap.PartyCommContent}">
@@ -536,6 +536,8 @@
<actions>
<set field="titleProperty" value="PageTitleEditCommunication"
/>
<set field="tabButtonItem" value="CommunicationEvent" />
+ <set field="portalPageId" from-field="parameters.portalPageId"
default-value="parameters.portalPageId"/>
+ <set field="headerItem" from-field="parameters.portalPageId"/>
<entity-one entity-name="CommunicationEvent"
value-name="communicationEvent" />
<script
location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy"/>
<script
location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/>
