svn commit: r906783 - /ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

[hansbak-2]

Author: hansbak
Date: Fri Feb  5 02:53:34 2010
New Revision: 906783

URL: http://svn.apache.org/viewvc?rev=906783&view=rev
Log:
update the planned hours field on the task list did not work if the workEffortSkillStandard record did not exist at all in the project manager

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=906783&r1=906782&r2=906783&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Fri Feb  5 02:53:34 2010
@@ -188,10 +188,24 @@
                 <entity-and list="workEffortSkillStandards" entity-name="WorkEffortSkillStandard">
                     <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
                 </entity-and>
-                <first-from-list entry="workEffortSkillStandard" list="workEffortSkillStandards"/>
-                <set field="updateWorkEffortSkillStandard.skillTypeId" from-field="workEffortSkillStandard.skillTypeId"/>
+                <if-not-empty field="workEffortSkillStandards">
+                    <first-from-list entry="workEffortSkillStandard" list="workEffortSkillStandards"/>
+                    <set field="updateWorkEffortSkillStandard.skillTypeId" from-field="workEffortSkillStandard.skillTypeId"/>
+                    <else>
+                        <set field="updateWorkEffortSkillStandard.skillTypeId" value="_NA_"/>
+                    </else>
+                </if-not-empty>
             </if-empty>
-            <call-service service-name="updateWorkEffortSkillStandard" in-map-name="updateWorkEffortSkillStandard"/>
+            <entity-one value-field="workEffortSkillStandard" entity-name="WorkEffortSkillStandard">
+                <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
+                <field-map field-name="skillTypeId" from-field="updateWorkEffortSkillStandard.skillTypeId"/>
+            </entity-one>
+            <if-not-empty field="workEffortSkillStandard">
+                <call-service service-name="updateWorkEffortSkillStandard" in-map-name="updateWorkEffortSkillStandard"/>
+                <else>
+                    <call-service service-name="createWorkEffortSkillStandard" in-map-name="updateWorkEffortSkillStandard"/>
+                </else>
+            </if-not-empty>
         </if-not-empty>
         <!-- if required can update more task related info here -->
     </simple-method>