fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/PM-1340 (pull request #1494)

Browse Source 
PM-1340 IMPROVEMENT
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-20 12:55:35 -04:00
parent e23d456ad6 7f5c72d3c6
commit e0812f6386
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,9 +147,19 @@ class pmDynaform
$items[$key]->data = $rows; $items[$key]->data = $rows;
} }
if ($items[$key]->type !== "grid") { if ($items[$key]->type !== "grid") {
$value = "";
$label = "";
if (isset($this->data[$items[$key]->name . "_label"])) {
$value = $this->data[$items[$key]->name];
$label = $this->data[$items[$key]->name . "_label"];
}
if (isset($this->data[$items[$key]->name . "_value"])) {
$value = $this->data[$items[$key]->name . "_value"];
$label = $this->data[$items[$key]->name];
}
$items[$key]->data = array( $items[$key]->data = array(
"value" => $this->data[$items[$key]->name], "value" => $value,
"label" => $this->searchValues($items[$key]->name, $this->data[$items[$key]->name]) "label" => $label
); );
} }
} }

6
workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
View File

@@ -22,10 +22,6 @@ function dynaFormChanged(frm) {
return false; return false;
} }
$(window).load(function () { $(window).load(function () {
/*if ((navigator.userAgent.indexOf("MSIE") !== -1) || (navigator.userAgent.indexOf("Trident") !== -1)) {
document.body.innerHTML = "<div style='margin:15px'>Responsive Dynaforms are not supported in this browser.</div>";
return;
}*/
if (pm_run_outside_main_app === 'true') { if (pm_run_outside_main_app === 'true') {
if (parent.showCaseNavigatorPanel) { if (parent.showCaseNavigatorPanel) {
parent.showCaseNavigatorPanel('DRAFT'); parent.showCaseNavigatorPanel('DRAFT');
@@ -49,7 +45,7 @@ $(window).load(function () {
submitRest: false submitRest: false
}); });
new PMDynaform.core.Proxy({ new PMDynaform.core.Proxy({
url: "http://" + window.project.keys.server + ":"+port +"/" + window.project.keys.apiName + "/" + window.project.keys.apiVersion + "/" + window.project.keys.workspace + "/cases/" + app_uid + "/variables", url: "http://" + window.project.keys.server + "/" + window.project.keys.apiName + "/" + window.project.keys.apiVersion + "/" + window.project.keys.workspace + "/cases/" + app_uid + "/variables",
method: 'GET', method: 'GET',
data: {}, data: {},
keys: window.project.token, keys: window.project.token,