fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jonathan
2015-04-09 17:01:08 -04:00
parent 5e28fe55f2 4fecb89ee3
commit 15ab7ac6ee
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gulliver/system/class.form.php
View File

@@ -478,6 +478,14 @@ class Form extends XmlForm
} }
} }
break; 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": case "link":
$values[$k] = $newValues[$k]; $values[$k] = $newValues[$k];
$values[$k . "_label"] = $newValues[$k . "_label"]; $values[$k . "_label"] = $newValues[$k . "_label"];

6
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -811,6 +811,12 @@ class Cases
} }
Validator::isInteger($del_index, '$del_index'); 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 = new \Cases();
$case->unpauseCase( $app_uid, $del_index, $usr_uid ); $case->unpauseCase( $app_uid, $del_index, $usr_uid );
} }