From 640ebc526d1aa1dc12af7f273da2aa3aa1d44948 Mon Sep 17 00:00:00 2001
From: Freddy Daniel Rojas Valda <daniel.rojas@colosa.com>
Date: Mon, 10 Feb 2014 11:38:16 -0400
Subject: [PATCH] Fix notice ASSIGNEE and ADHOC-ASSIGNEE.

---
 workflow/engine/src/BusinessModel/Task.php    |  2 ++
 .../Project/Activity/Assignee.php             | 36 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php
index 05058b8be..23e00aebe 100644
--- a/workflow/engine/src/BusinessModel/Task.php
+++ b/workflow/engine/src/BusinessModel/Task.php
@@ -1201,6 +1201,7 @@ class Task
                 throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity'));
             }
             $iType = 1;
+            $iRelation = '';
             $oCriteria = new \Criteria('workflow');
             $oCriteria->addSelectColumn( \TaskUserPeer::TU_RELATION );
             $oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID);
@@ -1775,6 +1776,7 @@ class Task
                 throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity'));
             }
             $iType = 2;
+            $iRelation = '';
             $oCriteria = new \Criteria('workflow');
             $oCriteria->addSelectColumn( \TaskUserPeer::TU_RELATION );
             $oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID);
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
index 66cd81ded..df8eabe51 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
@@ -30,7 +30,7 @@ class Assignee extends Api
             //Response
             $response = $arrayData;
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
         return $response;
@@ -55,7 +55,7 @@ class Assignee extends Api
             //Response
             $response = $arrayData;
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
         return $response;
@@ -74,11 +74,11 @@ class Assignee extends Api
         $response = array();
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->getTaskAssignee($prjUid, $actUid, $aasUid);
+            $objectData = $task->getTaskAssignee($prjUid, $actUid, $aasUid);
             //Response
-            $response = $arrayData;
+            $response = $objectData;
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
         return $response;
@@ -98,7 +98,7 @@ class Assignee extends Api
     {
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->addTaskAssignee($prjUid, $actUid, $aas_uid, $aas_type);
+            $task->addTaskAssignee($prjUid, $actUid, $aas_uid, $aas_type);
         } catch (\Exception $e) {
             //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
@@ -117,9 +117,9 @@ class Assignee extends Api
     {
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->removeTaskAssignee($prjUid, $actUid, $aasUid);
+            $task->removeTaskAssignee($prjUid, $actUid, $aasUid);
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
     }
@@ -143,7 +143,7 @@ class Assignee extends Api
             //Response
             $response = $arrayData;
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
         return $response;
@@ -168,7 +168,7 @@ class Assignee extends Api
             //Response
             $response = $arrayData;
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
         return $response;
@@ -187,11 +187,11 @@ class Assignee extends Api
         $response = array();
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->getTaskAdhocAssignee($prjUid, $actUid, $aasUid);
+            $objectData = $task->getTaskAdhocAssignee($prjUid, $actUid, $aasUid);
             //Response
-            $response = $arrayData;
+            $response = $objectData;
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
         return $response;
@@ -211,9 +211,9 @@ class Assignee extends Api
     {
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->addTaskAdhocAssignee($prjUid, $actUid, $ada_uid, $ada_type);
+            $task->addTaskAdhocAssignee($prjUid, $actUid, $ada_uid, $ada_type);
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
     }
@@ -230,11 +230,11 @@ class Assignee extends Api
     {
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->removeTaskAdhocAssignee($prjUid, $actUid, $adaUid);
+            $task->removeTaskAdhocAssignee($prjUid, $actUid, $adaUid);
         } catch (\Exception $e) {
-            //response
+            //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
-    }
+        }
 }