svn commit: r1791279 - in /ofbiz/branches: release14.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml release15.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml

Author: jleroux
Date: Thu Apr 13 17:02:13 2017
New Revision: 1791279

URL: http://svn.apache.org/viewvc?rev=1791279&view=rev
Log:
"Applied fix from trunk framework BY HAND for revision: 1791277  "
------------------------------------------------------------------------
r1791277 | jleroux | 2017-04-13 18:56:58 +0200 (jeu. 13 avr. 2017) | 19 lignes

Fixed: WorkEffort shows error on party assignment
(OFBIZ-9314)

Steps to reproduce:
Go to workEffort component.
2) Create a new task from New Task button
    https://localhost:8443/workeffort/control/mytasks .
3) After creating Task with required fields, click on parties tab.
4) Screen for WorkEffort Party Assignment will be displayed.
5) Choose any party and role.
6) Click on Add. Error will be displayed.

Solution:
Any party is assigned to a WorkEffort on specific role, hence it is necessary
that party should be in that role first (PartyRole).
Added code which make sure the party should be in given role (i.e service call
to ensurePartyRole).

Thanks: Jagpreet Kaur
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release14.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/branches/release15.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml

Modified: ofbiz/branches/release14.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=1791279&r1=1791278&r2=1791279&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/branches/release14.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Thu Apr 13 17:02:13 2017
@@ -354,6 +354,9 @@ under the License.
         </if-not-empty>
         <check-errors/>
 
+        <set field="ensurePartyRoleCtx.partyId" from-field="parameters.partyId"/>
+        <set field="ensurePartyRoleCtx.roleTypeId" from-field="parameters.roleTypeId"/>
+        <call-service service-name="ensurePartyRole" in-map-name="ensurePartyRoleCtx"/>
         <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/>
 
         <set-pk-fields map="parameters" value-field="newEntity"/>

Modified: ofbiz/branches/release15.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=1791279&r1=1791278&r2=1791279&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/branches/release15.12/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Thu Apr 13 17:02:13 2017
@@ -354,6 +354,9 @@ under the License.
         </if-not-empty>
         <check-errors/>
 
+        <set field="ensurePartyRoleCtx.partyId" from-field="parameters.partyId"/>
+        <set field="ensurePartyRoleCtx.roleTypeId" from-field="parameters.roleTypeId"/>
+        <call-service service-name="ensurePartyRole" in-map-name="ensurePartyRoleCtx"/>
         <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/>
 
         <set-pk-fields map="parameters" value-field="newEntity"/>