Author: hansbak
Date: Wed Dec 19 01:12:42 2007
New Revision: 605476
URL: http://svn.apache.org/viewvc?rev=605476&view=rev
Log:
give mytask its own decorator
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=605476&r1=605475&r2=605476&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Dec 19
01:12:42 2007
@@ -118,47 +118,68 @@
</widgets>
</section>
</screen>
- <screen name="CommonTaskDecorator">
- <section>
- <actions>
+ <screen name="CommonTaskDecorator">
+ <section>
+ <actions>
<entity-one entity-name="WorkEffort" value-name="workEffort"/>
<service service-name="getProjectIdAndName"
result-map-name="result">
<field-map field-name="taskId"
env-name="parameters.workEffortId"/>
</service>
<set field="projectId" from-field="result.projectId"/>
<set field="projectName" from-field="result.projectName"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="WORKEFFORTMGR"
action="_VIEW"/>
- </condition>
- <widgets>
- <section>
- <condition>
- <not>
- <if-empty field-name="workEffort"/>
- </not>
- </condition>
- <widgets>
- <include-menu name="TaskTabBar"
location="component://projectmgr/widget/Menus.xml"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="workEffort"/>
+ </not>
+ </condition>
+ <widgets>
+ <include-menu name="TaskTabBar"
location="component://projectmgr/widget/Menus.xml"/>
<label style="head1"
text="${uiLabelMap.ProjectMgrTaskCurrent}:
${workEffort.workEffortName}[${workEffort.workEffortId}] Project:
${projectName}"/>
<link style="head1"
text="[${projectId}]" target="projectView?projectId=${projectId}"/>
- </widgets>
- </section>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label
style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
+ </widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="CommonMyTaskDecorator">
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="WORKEFFORTMGR"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="CommonSkillTypeDecorator">
<section>
<actions>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=605476&r1=605475&r2=605476&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Dec 19
01:12:42 2007
@@ -100,7 +100,7 @@
<set field="myTask" value="notNull"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaskDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonMyTaskDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
