svn commit: r778629 - in /ofbiz/branches/release09.04: ./ specialpurpose/projectmgr/entitydef/entitymodel.xml specialpurpose/projectmgr/widget/CommonScreens.xml

[hansbak-2]

Author: hansbak
Date: Tue May 26 09:12:42 2009
New Revision: 778629

URL: http://svn.apache.org/viewvc?rev=778629&view=rev
Log:
merge from trunk part of r778628: task list would not show

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/specialpurpose/projectmgr/entitydef/entitymodel.xml
    ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 26 09:12:42 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=778629&r1=778628&r2=778629&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/entitydef/entitymodel.xml Tue May 26 09:12:42 2009
@@ -153,7 +153,7 @@
     <view-link entity-alias="WEPH" rel-entity-alias="WET">
       <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/>
     </view-link>
-    <view-link entity-alias="WET" rel-entity-alias="WEPA">
+    <view-link entity-alias="WET" rel-entity-alias="WEPA" rel-optional="true"><!-- has to be true because all tasks should be should shown in the task findlist screen even when not connected to a party -->
       <key-map field-name="workEffortId"/>
     </view-link>
     <relation type="one-nofk" rel-entity-name="PartyNameView">

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=778629&r1=778628&r2=778629&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/widget/CommonScreens.xml Tue May 26 09:12:42 2009
@@ -98,6 +98,7 @@
     <screen name="CommonTaskDecorator">
         <section>
             <actions>
+                <set field="headerItem" value="task"/>
                 <entity-one entity-name="WorkEffort" value-field="workEffort"/>
                 <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy"/>
             </actions>
@@ -136,6 +137,9 @@
     </screen>
     <screen name="CommonMyTaskDecorator">
         <section>
+            <actions>
+                <set field="headerItem" value="mytasks"/>
+            </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">