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

PM-4050

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-11-17 11:54:06 -04:00
parent bfe8cf71bd
commit 282e09ff7d
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -928,6 +928,25 @@ class pmDynaform
$json->options = G::json_decode($newVariable["VAR_ACCEPTED_VALUES"]); $json->options = G::json_decode($newVariable["VAR_ACCEPTED_VALUES"]);
} }
} }
//update variable
if ($key === "var_name" && $json->var_uid === $oldVariable["VAR_UID"]) {
$json->var_name = $newVariable["VAR_NAME"];
}
if ($key === "var_field_type" && $json->var_uid === $oldVariable["VAR_UID"]) {
$json->var_field_type = $newVariable["VAR_FIELD_TYPE"];
}
if ($key === "var_dbconnection" && $json->var_uid === $oldVariable["VAR_UID"]) {
$json->var_dbconnection = $newVariable["VAR_DBCONNECTION"];
}
if ($key === "var_dbconnection_label" && $json->var_uid === $oldVariable["VAR_UID"]) {
$json->var_dbconnection_label = $newVariable["VAR_DBCONNECTION_LABEL"];
}
if ($key === "var_sql" && $json->var_uid === $oldVariable["VAR_UID"]) {
$json->var_sql = $newVariable["VAR_SQL"];
}
if ($key === "var_accepted_values" && $json->var_uid === $oldVariable["VAR_UID"]) {
$json->var_accepted_values = G::json_decode($newVariable["VAR_ACCEPTED_VALUES"]);
}
} }
} }
} }

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

@@ -135,6 +135,7 @@ class Variable
$dbConnection = \DbSourcePeer::retrieveByPK($variable->getVarDbconnection(), $variable->getPrjUid()); $dbConnection = \DbSourcePeer::retrieveByPK($variable->getVarDbconnection(), $variable->getPrjUid());
$oldVariable = array( $oldVariable = array(
"VAR_UID" => $variable->getVarUid(),
"VAR_NAME" => $variable->getVarName(), "VAR_NAME" => $variable->getVarName(),
"VAR_FIELD_TYPE" => $variable->getVarFieldType(), "VAR_FIELD_TYPE" => $variable->getVarFieldType(),
"VAR_DBCONNECTION" => $variable->getVarDbconnection(), "VAR_DBCONNECTION" => $variable->getVarDbconnection(),
@@ -182,6 +183,7 @@ class Variable
//update dynaforms //update dynaforms
$dbConnection = \DbSourcePeer::retrieveByPK($variable->getVarDbconnection(), $variable->getPrjUid()); $dbConnection = \DbSourcePeer::retrieveByPK($variable->getVarDbconnection(), $variable->getPrjUid());
$newVariable = array( $newVariable = array(
"VAR_UID" => $variable->getVarUid(),
"VAR_NAME" => $variable->getVarName(), "VAR_NAME" => $variable->getVarName(),
"VAR_FIELD_TYPE" => $variable->getVarFieldType(), "VAR_FIELD_TYPE" => $variable->getVarFieldType(),
"VAR_DBCONNECTION" => $variable->getVarDbconnection(), "VAR_DBCONNECTION" => $variable->getVarDbconnection(),