fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in dheeyi/processmaker/PM-2139 (pull request #1884)

Browse Source 
PM-2139 0017111: Change error message when deleting variable. Use DynaForm name, not its UID.
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-20 22:23:02 -04:00
parent 1693c2b2df 5cb68bc738
commit 29be3d887a
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()
{
if (!isset($this->fields["CURRENT_DYNAFORM"])) {

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

@@ -227,7 +227,8 @@ class Variable
$pmDynaform = new \pmDynaform();
$isUsed = $pmDynaform->isUsed($processUid, $variable);
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
$criteria = new \Criteria("workflow");