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

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2015-01-14 09:29:55 -04:00
parent 8f57f05c3b 0367d71092
commit abeb15e12b
6 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
View File

@@ -385,7 +385,6 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {
G::LoadClass('pmDynaform');
$a = new pmDynaform($_GET['DYN_UID'], $Fields['APP_DATA']);
if ($a->isResponsive()) {
$a->mergeValues();
$a->printView((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION']);
} else {
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
@@ -475,7 +474,6 @@ if ($actionAjax == 'historyDynaformGridPreview') {
G::LoadClass('pmDynaform');
$a = new pmDynaform($_GET['DYN_UID'], $Fields['APP_DATA']);
if ($a->isResponsive()) {
$a->mergeValues();
$a->printView((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION']);
} else {
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');

1
workflow/engine/methods/cases/cases_Step.php
View File

@@ -264,7 +264,6 @@ try {
G::LoadClass('pmDynaform');
$a = new pmDynaform($_GET['UID'], $Fields['APP_DATA']);
if ($a->isResponsive()) {
$a->mergeValues();
$a->printEdit((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION'], $array);
} else {
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));