fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in paulis/processmaker/PM-1532 (pull request #1821)

Browse Source 
I solved the issue PM-1532 informacion de History dynaform
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-31 16:40:25 -04:00
parent ec1a31e6a6 6819a08c61
commit 95c8fd27da
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/model/AppHistory.php
View File

@@ -130,6 +130,7 @@ class AppHistory extends BaseAppHistory
$c->add(AppHistoryPeer::PRO_UID, $PRO_UID); $c->add(AppHistoryPeer::PRO_UID, $PRO_UID);
$c->add(AppHistoryPeer::APP_UID, $APP_UID); $c->add(AppHistoryPeer::APP_UID, $APP_UID);
$c->add(AppHistoryPeer::TAS_UID, $TAS_UID);
if ((isset($DYN_UID))&&($DYN_UID!="")) { if ((isset($DYN_UID))&&($DYN_UID!="")) {
$c->add(AppHistoryPeer::DYN_UID, $DYN_UID); $c->add(AppHistoryPeer::DYN_UID, $DYN_UID);
} }

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

@@ -851,7 +851,7 @@ class Ajax
$_POST["DYN_UID"] = $_REQUEST["DYN_UID"]; $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
$G_PUBLISH = new Publisher(); $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"] = $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"]["PREVIOUS_STEP_LABEL"] = "";
$Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = ""; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = "";

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

@@ -383,7 +383,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] ); $FieldsHistory = $_SESSION['HISTORY_DATA'];
$Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']]; $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';

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

@@ -549,7 +549,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] ); $FieldsHistory = $_SESSION['HISTORY_DATA'];
$Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']]; $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';

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

@@ -700,7 +700,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
break; break;
case 'showDynaformHistory': case 'showDynaformHistory':
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] ); $FieldsHistory = $_SESSION['HISTORY_DATA'];
$Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']]; $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';

2
workflow/engine/templates/cases/cases_DynaformHistory.php
View File

@@ -172,7 +172,7 @@ if (!isset($changedValues)) {
$tpl->assign("noResults", G::LoadTranslation("ID_NO_RECORDS_FOUND")); $tpl->assign("noResults", G::LoadTranslation("ID_NO_RECORDS_FOUND"));
} }
$_SESSION['HISTORY_DATA'] = serialize($historyData); $_SESSION['HISTORY_DATA'] = $historyData;
$tpl->gotoBlock("_ROOT"); $tpl->gotoBlock("_ROOT");
$tpl->printToScreen(); $tpl->printToScreen();

35
workflow/engine/templates/cases/open.js
View File

@@ -1539,24 +1539,23 @@ Ext.onReady(function(){
TabPanel.setActiveTab(tabId); TabPanel.setActiveTab(tabId);
} }
else { else {
if(!isBrowserIE()){ if(name == "processMap" && isBrowserIE()){
TabPanel.add({ var windContainer = window.open(uri,"winContainer");
id: tabId, } else {
title: menuSelectedTitle[name], TabPanel.add({
frameConfig: {name: name + 'Frame', id: name + 'Frame'}, id: tabId,
defaultSrc: uri, title: menuSelectedTitle[name],
loadMask: {msg: _('ID_LOADING_GRID') + '...'}, frameConfig:{name: name + 'Frame', id: name + 'Frame'},
autoWidth: true, defaultSrc : uri,
closable: true, loadMask:{msg:_('ID_LOADING_GRID')+'...'},
autoScroll: true, autoWidth: true,
bodyStyle: {height: (PMExt.getBrowser().screen.height - 60) + 'px', overflow: 'auto'} closable:true,
}).show(); autoScroll: true,
bodyStyle:{height: (PMExt.getBrowser().screen.height-60) + 'px', overflow:'auto'}
TabPanel.doLayout(); }).show();
}else{ TabPanel.doLayout();
var windContainer = window.open(uri,"winContainer"); }
} }
}
} }
}, },
failure: function ( result, request) { failure: function ( result, request) {