fernando/luos
1
0
Fork 0
Code Releases Activity

PM-2139 0017111: Change error message when deleting variable. Use DynaForm name, not its UID.

Browse Source 
Causa : Definida asi en su construccion.
Solucion : Se definio nuevos parametros de retorno cuando el endpoint hacia la llamada.
This commit is contained in:
dheeyi
2015-04-08 12:33:23 -04:00
parent 75ecaa9fcb
commit 5cb68bc738
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.pmDynaform.php
View File

@@ -33,6 +33,14 @@ class pmDynaform
} }
} }
public function getDynaformTitle($idDynaform)
{
$d = new Dynaform();
$d->setDynUid($idDynaform);
$titleDynaform = $d->getDynTitle();
return $titleDynaform;
}
public function getDynaform() public function getDynaform()
{ {
if (!isset($this->fields["CURRENT_DYNAFORM"])) { if (!isset($this->fields["CURRENT_DYNAFORM"])) {

3
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -222,7 +222,8 @@ class Variable
$pmDynaform = new \pmDynaform(); $pmDynaform = new \pmDynaform();
$isUsed = $pmDynaform->isUsed($processUid, $variable); $isUsed = $pmDynaform->isUsed($processUid, $variable);
if ($isUsed !== false) { if ($isUsed !== false) {
throw new \Exception(\G::LoadTranslation("ID_VARIABLE_IN_USE", array($variableUid, $isUsed))); $titleDynaform=$pmDynaform->getDynaformTitle($isUsed);
throw new \Exception(\G::LoadTranslation("ID_VARIABLE_IN_USE", array($titleDynaform)));
} }
//Delete //Delete
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");