diff --git a/workflow/engine/classes/model/AppHistory.php b/workflow/engine/classes/model/AppHistory.php index 23e069d00..dfd28e7a4 100755 --- a/workflow/engine/classes/model/AppHistory.php +++ b/workflow/engine/classes/model/AppHistory.php @@ -130,6 +130,7 @@ class AppHistory extends BaseAppHistory $c->add(AppHistoryPeer::PRO_UID, $PRO_UID); $c->add(AppHistoryPeer::APP_UID, $APP_UID); + $c->add(AppHistoryPeer::TAS_UID, $TAS_UID); if ((isset($DYN_UID))&&($DYN_UID!="")) { $c->add(AppHistoryPeer::DYN_UID, $DYN_UID); } diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index 8c7b90c2c..8270614be 100755 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -851,7 +851,7 @@ class Ajax $_POST["DYN_UID"] = $_REQUEST["DYN_UID"]; $G_PUBLISH = new Publisher(); - $FieldsHistory = unserialize($_SESSION["HISTORY_DATA"]); + $FieldsHistory = $_SESSION["HISTORY_DATA"]; $Fields["APP_DATA"] = $FieldsHistory[$_POST["HISTORY_ID"]]; //isset($FieldsHistory[$_POST["HISTORY_ID"]])? $FieldsHistory[$_POST["HISTORY_ID"]] : ""; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["PREVIOUS_STEP_LABEL"] = ""; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = ""; diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php index bdd7d0430..498b738a2 100644 --- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php +++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php @@ -383,7 +383,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') { global $G_PUBLISH; $G_PUBLISH = new Publisher(); - $FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] ); + $FieldsHistory = $_SESSION['HISTORY_DATA']; $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']]; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; diff --git a/workflow/engine/methods/cases/casesList_Ajax.php b/workflow/engine/methods/cases/casesList_Ajax.php index cac07617c..edf1c6098 100755 --- a/workflow/engine/methods/cases/casesList_Ajax.php +++ b/workflow/engine/methods/cases/casesList_Ajax.php @@ -549,7 +549,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') { global $G_PUBLISH; $G_PUBLISH = new Publisher(); - $FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] ); + $FieldsHistory = $_SESSION['HISTORY_DATA']; $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']]; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index 00f663f04..a494ff921 100755 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -700,7 +700,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { break; case 'showDynaformHistory': $G_PUBLISH = new Publisher(); - $FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] ); + $FieldsHistory = $_SESSION['HISTORY_DATA']; $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']]; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; diff --git a/workflow/engine/templates/cases/cases_DynaformHistory.php b/workflow/engine/templates/cases/cases_DynaformHistory.php index 4e2f511c6..dd00c587c 100755 --- a/workflow/engine/templates/cases/cases_DynaformHistory.php +++ b/workflow/engine/templates/cases/cases_DynaformHistory.php @@ -172,7 +172,7 @@ if (!isset($changedValues)) { $tpl->assign("noResults", G::LoadTranslation("ID_NO_RECORDS_FOUND")); } -$_SESSION['HISTORY_DATA'] = serialize($historyData); +$_SESSION['HISTORY_DATA'] = $historyData; $tpl->gotoBlock("_ROOT"); $tpl->printToScreen();