From c93fd61bc38859afcd32aff1689464498b70ff75 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Tue, 7 Apr 2015 17:16:45 -0400 Subject: [PATCH 1/4] I solved the issue PM-1942 added label by yesno field --- gulliver/system/class.form.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php index d45e04ee0..f37a8dd33 100755 --- a/gulliver/system/class.form.php +++ b/gulliver/system/class.form.php @@ -478,6 +478,14 @@ class Form extends XmlForm } } break; + case 'yesno': + $values[$k] = $newValues[$k]; + if($newValues[$k] == 1){ + $values[$k . "_label"] = 'Yes'; + } else { + $values[$k . "_label"] = 'No'; + } + break; case "link": $values[$k] = $newValues[$k]; $values[$k . "_label"] = $newValues[$k . "_label"]; From 7ce9ffd6a234a9b4d9671fff55a0cdbf7f7621e7 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Wed, 8 Apr 2015 09:04:19 -0400 Subject: [PATCH 2/4] I corrected the label by yesno field --- gulliver/system/class.form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php index f37a8dd33..cf8faf2b2 100755 --- a/gulliver/system/class.form.php +++ b/gulliver/system/class.form.php @@ -481,9 +481,9 @@ class Form extends XmlForm case 'yesno': $values[$k] = $newValues[$k]; if($newValues[$k] == 1){ - $values[$k . "_label"] = 'Yes'; + $values[$k . "_label"] = G::LoadTranslation('ID_FIELD_DYNAFORM_YES_LABEL'); } else { - $values[$k . "_label"] = 'No'; + $values[$k . "_label"] = G::LoadTranslation('ID_FIELD_DYNAFORM_NO_LABEL'); } break; case "link": From 4531071f8c192ed31b77b9eb576b8a8a7016776e Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Wed, 8 Apr 2015 10:53:46 -0400 Subject: [PATCH 3/4] I correted ID --- gulliver/system/class.form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php index cf8faf2b2..63e3fd5bf 100755 --- a/gulliver/system/class.form.php +++ b/gulliver/system/class.form.php @@ -481,9 +481,9 @@ class Form extends XmlForm case 'yesno': $values[$k] = $newValues[$k]; if($newValues[$k] == 1){ - $values[$k . "_label"] = G::LoadTranslation('ID_FIELD_DYNAFORM_YES_LABEL'); + $values[$k . "_label"] = G::LoadTranslation('ID_YES_VALUE'); } else { - $values[$k . "_label"] = G::LoadTranslation('ID_FIELD_DYNAFORM_NO_LABEL'); + $values[$k . "_label"] = G::LoadTranslation('ID_NO_VALUE'); } break; case "link": From 3b624e4a020d85adf8a625834514ad24dff178e5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Wed, 8 Apr 2015 16:13:24 -0400 Subject: [PATCH 4/4] PM-2109 "REST endpoint PUT /cases/{app_uid}/unpause..." SOLVED > Code Issue: REST endpoint PUT /cases/{app_uid}/unpause can be called on a case which isn't paused > Solution: Se agrega validacion cuando un caso NO esta pausado se mostrara un mensaje. --- workflow/engine/src/ProcessMaker/BusinessModel/Cases.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 7509ff9f3..d5d610404 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -811,6 +811,12 @@ class Cases } Validator::isInteger($del_index, '$del_index'); + $oDelay = new \AppDelay(); + + if (!$oDelay->isPaused($app_uid, $del_index)) { + throw (new \Exception(\G::LoadTranslation("ID_CASE_NOT_PAUSED", array($app_uid)))); + } + $case = new \Cases(); $case->unpauseCase( $app_uid, $del_index, $usr_uid ); }