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 2009/03/30 15:36:47 UTC
svn commit: r759965 - in /ofbiz/trunk:
applications/party/webapp/partymgr/communication/
framework/widget/src/org/ofbiz/widget/ specialpurpose/myportal/data/
specialpurpose/myportal/webapp/myportal/WEB-INF/
specialpurpose/myportal/widget/ specialpurpos...
Author: hansbak
Date: Mon Mar 30 13:36:47 2009
New Revision: 759965
URL: http://svn.apache.org/viewvc?rev=759965&view=rev
Log:
cleanup in myportal, move taskslist back to project manager
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.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=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Mon Mar 30 13:36:47 2009
@@ -214,11 +214,9 @@
</hyperlink>
</field>
<field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType" description="${description}"/></field>
- <field name="partyIdFrom">
+ <field name="partyIdFrom" use-when="partyIdFrom!=void">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechFrom.infoString})">
- <sub-hyperlink description=" [${communicationEvent.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
- <parameter param-name="partyId" from-field="communicationEvent.partyIdFrom"/>
- </sub-hyperlink>
+ <sub-hyperlink description=" [${communicationEvent.partyIdFrom}]" target="/partymgr/control/viewprofile?partyIdFrom=${partyIdFrom}" target-type="inter-app"/>
</display-entity>
</field>
<field name="partyIdTo">
@@ -240,9 +238,7 @@
<field name="communicationEventId"><display/></field>
<field name="partyIdFrom" use-when=""my"==void" title="${uiLabelMap.PartyPartyFrom}">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
- <sub-hyperlink target="viewprofile" description="[${partyIdFrom}]">
- <parameter param-name="partyId" from-field="partyIdFrom"/>
- </sub-hyperlink>
+ <sub-hyperlink target="viewprofile?partyId=${partyIdFrom}" description="[${partyIdFrom}]"/>
</display-entity>
</field>
<field name="partyIdTo" use-when=""my"==void" title="${uiLabelMap.PartyPartyTo}">
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Mon Mar 30 13:36:47 2009
@@ -289,7 +289,7 @@
public String getValue(Map<String, Object> context) {
if (this.value != null) {
return this.value.expandString(context);
- } else if (this.fromField != null) {
+ } else if (this.fromField != null && this.fromField.get(context) != null) {
Object contextVal = this.fromField.get(context);
return contextVal.toString();
} else {
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Mon Mar 30 13:36:47 2009
@@ -73,11 +73,9 @@
<PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001" />
<PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" />
- <PortletCategory portletCategoryId="TASKS" description="Task(s)"/>
<PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) of Customer" />
<PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
- <PortalPortlet portalPortletId="mytasks" portletName="My Tasks" screenName="MyTasks" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Tasks From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
<PortalPortlet portalPortletId="ListInvoices" portletName="List Invoices" screenName="ListInvoices" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Invoices From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
<PortalPortlet portalPortletId="ListCustRequests" portletName="List Cust Requests" screenName="ListCustRequests" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Cust Requests From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
<PortalPortlet portalPortletId="ListCustRequestsComp" portletName="List Cust Requests Completed" screenName="ListCustRequestsCompleted" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Cust Requests Completed From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
@@ -139,7 +137,6 @@
<PortletPortletCategory portalPortletId="mycompanycomms" portletCategoryId="COMMUNICATIONS"/>
- <PortletPortletCategory portalPortletId="mytasks" portletCategoryId="TASKS"/>
<PortletPortletCategory portalPortletId="ListInvoices" portletCategoryId="LIST_CUSTOMER"/>
<PortletPortletCategory portalPortletId="ListCustRequests" portletCategoryId="LIST_CUSTOMER"/>
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=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Mon Mar 30 13:36:47 2009
@@ -43,18 +43,6 @@
<response name="resultPage" type="view" value="newRegisterLogin"/>
</request-map>
- <!-- MY TASKS -->
- <request-map uri="myTasks">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="myTasks"/>
- </request-map>
- <request-map uri="updateTaskAssigment">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateTaskAssigment"/>
- <response name="success" type="request" value="myTasks"/>
- <response name="error" type="request" value="getToNextDonePage"/>
- </request-map>
-
<!-- COMPANY COMMUNICATION -->
<request-map uri="myCompanyComms">
<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=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Mon Mar 30 13:36:47 2009
@@ -36,7 +36,7 @@
<property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="MyPortalHelpUrls" map-name="helpUrlsMap" global="true"/>
-
+ <set field="headerItem" value="${parameters._HOME_VIEW_PARAMS_.portalPageId}"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.MyPortalInformation" global="true"/>
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
<set field="applicationMenuName" value="MyPortalAppBar" global="true"/>
@@ -55,7 +55,6 @@
<screen name="CommonPartyDecorator">
<section>
<actions>
- <set field="headerItem" value="${parameters.portalPageId}"/>
<set field="partyId" from-field="userLogin.partyId"/>
<set field="parameters.partyId" from-field="userLogin.partyId"/>
<entity-one entity-name="Party" value-field="party"/>
@@ -87,9 +86,6 @@
<screen name="CommonMyTimeDecorator">
<section>
- <actions>
- <set field="headerItem" value="${parameters.portalPageId}"/>
- </actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body"/>
@@ -136,27 +132,13 @@
</section>
</screen>
- <screen name="CommonTaskDecorator">
- <section>
- <actions>
- <set field="headerItem" value="${parameters.portalPageId}"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body"/>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="CommonMyTaskDecorator">
<section>
- <actions>
- <set field="headerItem" value="${parameters.portalPageId}"/>
- </actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body"/>
+ <decorator-section name="body">
+ <decorator-section-include name="body"/>
+ </decorator-section>
</decorator-screen>
</widgets>
</section>
@@ -252,10 +234,6 @@
<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}">
@@ -270,9 +248,6 @@
<screen name="MyTimesheet">
<section>
- <actions>
- <set field="headerItem" value="myTimesheet" />
- </actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -286,9 +261,6 @@
<screen name="MyCommunications">
<section>
- <actions>
- <set field="headerItem" from-field="parameters.portalPageId" />
- </actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -302,9 +274,6 @@
</screen>
<screen name="MyTasks">
<section>
- <actions>
- <set field="headerItem" from-field="parameters.portalPageId" />
- </actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -317,9 +286,6 @@
</screen>
<screen name="OtherCommunications">
<section>
- <actions>
- <set field="headerItem" from-field="parameters.portalPageId" />
- </actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Mon Mar 30 13:36:47 2009
@@ -43,127 +43,6 @@
</widgets>
</section>
</screen>
- <!--screen name="MyTimesheet">
- <section>
- <actions>
- <set field="headerItem" value="myTimesheet"/>
- <set field="portalPageId" value="parameters.portalPageId"/>
- <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
- </actions>
- <widgets>
- <section>
- <condition>
- <if-has-permission permission="PROJECTMGR" action="_VIEW"/>
- </condition>
- <widgets>
- <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
- navigation-menu-name="MyTimesheetMenu" collapsible="true" name="timesheet">
- <include-menu name="MyTimesheetMenu" location="component://myportal/widget/MyPortalMenus.xml"/>
- <section>
- <condition>
- <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
- </condition>
- <widgets>
- <include-form name="WeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
- </widgets>
- <fail-widgets>
- <include-form name="EditWeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
- </fail-widgets>
- </section>
- </screenlet>
- </widgets>
- <fail-widgets>
- <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
- collapsible="true" name="timesheet">
- <section>
- <condition>
- <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
- </condition>
- <widgets>
- <include-form name="WeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
- </widgets>
- <fail-widgets>
- <include-form name="EditWeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
- </fail-widgets>
- </section>
- </screenlet>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen-->
- <screen name="MyTasks">
- <section>
- <actions>
- <set field="portalPageId" value="myTasks"/>
- <entity-and entity-name="WorkEffortAndPartyAssign"
- list="tasks" filter-by-date="true">
- <field-map field-name="partyId" from-field="userLogin.partyId" />
- <field-map field-name="workEffortTypeId" value="TASK" />
- <field-map field-name="currentStatusId" value="PTS_CREATED" />
- </entity-and>
- </actions>
- <widgets>
- <section>
- <condition>
- <if-has-permission permission="PROJECTMGR"
- action="_VIEW" />
- </condition>
- <widgets>
- <screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"
- name="mytasks" collapsible="true" navigation-menu-name="MyTasksMenu">
- <include-menu name="MyTasksMenu"
- location="component://myportal/widget/MyPortalMenus.xml" />
- <section>
- <condition>
- <not>
- <if-empty field="tasks" />
- </not>
- </condition>
- <widgets>
- <include-form name="MyTasks"
- location="component://myportal/widget/MyPortalForms.xml" />
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
- </container>
- <container>
- <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
- </container>
- </fail-widgets>
- </section>
- </screenlet>
- </widgets>
- <fail-widgets>
- <screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"
- name="mytasks" collapsible="true">
- <section>
- <condition>
- <not>
- <if-empty field="tasks" />
- </not>
- </condition>
- <widgets>
- <include-form name="MyTasks"
- location="component://myportal/widget/MyPortalForms.xml" />
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
- </container>
- <container>
- <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
- </container>
- </fail-widgets>
- </section>
- </screenlet>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
<screen name="MyCompanyComms">
<section>
<actions>
Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml Mon Mar 30 13:36:47 2009
@@ -27,4 +27,12 @@
description="My Current Timesheet" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
<PortletPortletCategory portalPortletId="mytimesheet" portletCategoryId="PROJECTMANAGER"/>
+ <PortalPortlet
+ portalPortletId="mytasks"
+ portletName="MyTasks"
+ screenName="MyTaskList"
+ screenLocation="component://projectmgr/widget/TaskScreens.xml"
+ description="My Tasks from the Project Manager" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
+ <PortletPortletCategory portalPortletId="mytasks" portletCategoryId="PROJECTMANAGER"/>
+
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Mon Mar 30 13:36:47 2009
@@ -266,13 +266,9 @@
</request-map>
<request-map uri="MyTasks">
<security https="true" auth="true"/>
- <response name="success" type="view" value="MyTasks"/>
+ <response name="success" type="view" value="MyTasks" save-current-view="true"/>
</request-map>
- <!--request-map uri="EditTaskListAndAssoc">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditTaskListAndAssoc"/>
- </request-map-->
<request-map uri="createTaskListAndAssoc">
<security https="true" auth="true"/>
<event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
@@ -286,13 +282,6 @@
<response name="error" type="view" value="Dependencies"/>
</request-map>
- <!-- TO DO
- <request-map uri="ChildTaskWorkEfforts">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ChildTaskWorkEfforts"/>
- </request-map>
- -->
-
<request-map uri="FindPhase">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindPhase"/>
@@ -347,7 +336,7 @@
</request-map>
<request-map uri="MyTimesheet">
<security https="true" auth="true"/>
- <response name="success" type="view" value="MyTimesheet"/>
+ <response name="success" type="view" value="MyTimesheet" save-current-view="true"/>
</request-map>
<request-map uri="EditTimeEntries">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Mon Mar 30 13:36:47 2009
@@ -45,6 +45,7 @@
<set field="applicationMenuName" value="ProjectMgrAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://projectmgr/widget/Menus.xml" global="true"/>
<set field="applicationTitle" value="${uiLabelMap.ProjectMgrApplication}" global="true"/>
+ <set field="my" value="My" global="true"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
@@ -96,17 +97,6 @@
</screen>
<screen name="CommonTaskDecorator">
<section>
- <actions>
- <set field="headerItem" value="task"/>
- <entity-one entity-name="WorkEffort" value-field="workEffort"/>
- <service service-name="getProjectIdAndNameFromTask" result-map="result">
- <field-map field-name="taskId" from-field="parameters.workEffortId"/>
- </service>
- <set field="projectId" from-field="result.projectId"/>
- <set field="projectName" from-field="result.projectName"/>
- <set field="phaseId" from-field="result.phaseId"/>
- <set field="phaseName" from-field="result.phaseName"/>
- </actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Mon Mar 30 13:36:47 2009
@@ -405,7 +405,10 @@
<if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
</and>
</condition>
- <link target="TimeSheetStatusToComplete?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_COMPLETED"/>
+ <link target="TimeSheetStatusToComplete">
+ <parameter param-name="timesheetId" from-field="timesheet.timesheetId"/>
+ <parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
+ </link>
</menu-item>
<menu-item name="TimeSheetStatustoProgress" title="${uiLabelMap.ProjectMgrSetStatusInProgress}">
<condition>
@@ -414,7 +417,10 @@
<if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
</and>
</condition>
- <link target="TimeSheetStatustoProgress?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_IN_PROCESS"/>
+ <link target="TimeSheetStatustoProgress">
+ <parameter param-name="timesheetId" from-field="timesheet.timesheetId"/>
+ <parameter param-name="statusId" value="TIMESHEET_IN_PROCESS"/>
+ </link>
</menu-item>
</menu>
<menu name="MyTimeSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Mon Mar 30 13:36:47 2009
@@ -314,7 +314,6 @@
<section>
<actions>
<set field="titleProperty" value="ProjectMgrTaskSummary"/>
- <set field="headerItem" value="task"/>
<set field="tabButtonItem" value="taskView"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<set field="projectId" from-field="parameters.workEffortId"/>
@@ -327,12 +326,10 @@
</service>
</actions>
<widgets>
- <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="Common${parameters.my}TaskDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="lefthalf">
- <screenlet title="${uiLabelMap.PageTitleTaskInformation}">
- <include-form name="TaskInfo" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </screenlet>
+ <include-screen name="taskInfo"/>
<include-screen name="taskBefore"/>
<include-screen name="taskAfter"/>
</container>
@@ -347,12 +344,12 @@
</widgets>
</section>
</screen>
- <screen name="TaskInfo">
+ <screen name="taskInfo">
<section>
<widgets>
- <platform-specific>
- <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl"/></html>
- </platform-specific>
+ <screenlet title="${uiLabelMap.PageTitleTaskInformation}">
+ <include-form name="TaskInfo" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Mon Mar 30 13:36:47 2009
@@ -214,6 +214,7 @@
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${workEffortName}" target="taskView">
<parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="my" from-field="my"/>
</hyperlink>
</field>
<field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=759965&r1=759964&r2=759965&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Mon Mar 30 13:36:47 2009
@@ -39,7 +39,7 @@
<entity-order-by field-name="phaseName"/>
<entity-order-by field-name="workEffortName"/>
</entity-options>
- <sub-hyperlink target="taskView?workEffortId=${workEffortId}" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}"/>
+ <sub-hyperlink target="taskView?workEffortId=${workEffortId}&my=${my}" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}"/>
</drop-down>
</field>
<field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><check/></field>