From 4c5a8ca6c1261051493e3bb25b496f8ff92edfce Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Wed, 4 Jun 2014 11:21:38 -0400
Subject: [PATCH 1/2] Correcion de op_action adicionando RESEND

---
 .../ProcessMaker/Services/Api/Project/ProcessPermissions.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php
index 081036292..77bf5e6e2 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php
@@ -68,7 +68,7 @@ class ProcessPermissions extends Api
      * @param string $op_case_status {@from body} {@choice ALL,DRAFT,TO_DO,PAUSED,COMPLETED}
      * @param string $op_participate {@from body} {@choice 0,1}
      * @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY}
-     * @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE}
+     * @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE,RESEND}
      * @param string $tas_uid {@from body}
      * @param string $op_task_source {@from body}
      * @param string $dynaforms {@from body}
@@ -127,7 +127,7 @@ class ProcessPermissions extends Api
      * @param string $op_case_status {@from body} {@choice ALL,DRAFT,TO_DO,PAUSED,COMPLETED}
      * @param string $op_participate {@from body} {@choice 0,1}
      * @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY}
-     * @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE}
+     * @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE,RESEND}
      * @param string $tas_uid {@from body}
      * @param string $op_task_source {@from body}
      * @param string $dynaforms {@from body}

From 9599e657e7e3b2989e52ef0ef4cca91c38bbe0e4 Mon Sep 17 00:00:00 2001
From: Brayan Osmar Pereyra Suxo <brayan@colosa.com>
Date: Wed, 4 Jun 2014 14:31:37 -0400
Subject: [PATCH 2/2] Adicion de validacion en el nombre del CASE SCHEDULER

---
 .../engine/src/ProcessMaker/BusinessModel/CaseScheduler.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php b/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php
index f8e126d10..39236f97c 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php
@@ -151,6 +151,7 @@ class CaseScheduler
             $criteria = new \Criteria("workflow");
             $criteria->addSelectColumn(\CaseSchedulerPeer::TAS_UID);
             $criteria->add(\CaseSchedulerPeer::SCH_NAME, $name, \Criteria::EQUAL);
+            $criteria->add(\CaseSchedulerPeer::PRO_UID, $processUid, \Criteria::EQUAL);
             $rsCriteria = \CaseSchedulerPeer::doSelectRS($criteria);
             $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             $rsCriteria->next();
@@ -168,13 +169,14 @@ class CaseScheduler
      *
      * return bool Return true if the name exists, false otherwise
      */
-    public function existsNameUpdate($schUid, $name)
+    public function existsNameUpdate($processUid, $schUid, $name)
     {
         try {
             $criteria = new \Criteria("workflow");
             $criteria->addSelectColumn(\CaseSchedulerPeer::TAS_UID);
             $criteria->add(\CaseSchedulerPeer::SCH_NAME, $name, \Criteria::EQUAL);
             $criteria->add(\CaseSchedulerPeer::SCH_UID, $schUid, \Criteria::NOT_EQUAL);
+            $criteria->add(\CaseSchedulerPeer::PRO_UID, $processUid, \Criteria::EQUAL);
             $rsCriteria = \CaseSchedulerPeer::doSelectRS($criteria);
             $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             $rsCriteria->next();
@@ -545,7 +547,7 @@ class CaseScheduler
             if ($caseSchedulerData['SCH_NAME']=='') {
                 throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_EMPTY", array ('sch_name')));
             }
-            if ($this->existsNameUpdate($sSchUID, $caseSchedulerData['SCH_NAME'])) {
+            if ($this->existsNameUpdate($sProcessUID, $sSchUID, $caseSchedulerData['SCH_NAME'])) {
                 throw new \Exception(\G::LoadTranslation("ID_CASE_SCHEDULER_DUPLICATE"));
             }
             $mUser = $this->getUser($caseSchedulerData['SCH_DEL_USER_NAME'], $caseSchedulerData['TAS_UID']);