fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker (pull request #1555)

Browse Source 
PM-1571
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-04 14:06:04 -04:00
parent 1e40384db2 39fc054b02
commit f8fd0f218b
3 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ class pmDynaform
);
}
//query & options
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggets")) {
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggest")) {
if (!isset($json->dbConnection))
$json->dbConnection = "none";
if (!isset($json->sql))
@@ -135,14 +135,14 @@ class pmDynaform
//data
if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown") {
array_push($cells, array(
"value" => $row[$column->name],
"label" => $row[$column->name . "_label"]
"value" => isset($row[$column->name]) ? $row[$column->name] : "",
"label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : ""
));
}
if ($column->type === "suggest") {
array_push($cells, array(
"value" => $row[$column->name . "_label"],
"label" => $row[$column->name]
"value" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : "",
"label" => isset($row[$column->name]) ? $row[$column->name] : ""
));
}
}