Merge branch 'master' of https://bitbucket.org/jonathanquispe/processmaker

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"] = G::LoadTranslation('ID_YES_VALUE');
+                                } else {
+                                    $values[$k . "_label"] = G::LoadTranslation('ID_NO_VALUE');
+                                }
+                                break;
                             case "link":
                                 $values[$k] = $newValues[$k];
                                 $values[$k . "_label"] = $newValues[$k . "_label"];

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 );
     }