diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index 88d4b8f5c..b4fb6ddfe 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -421,7 +421,7 @@ class SkinEngine G::LoadClass( "configuration" ); $conf = new Configurations(); if (defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) { - $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d'))); + $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d H:i:s'))); } else { $smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG)); } @@ -725,7 +725,7 @@ class SkinEngine G::LoadClass( "configuration" ); $conf = new Configurations(); if ( defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) { - $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d'))); + $smarty->assign('udate', $conf->getSystemDate(date('Y-m-d H:i:s'))); } else { $smarty->assign('udate', G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG)); } diff --git a/workflow/engine/templates/setup/environmentSettings.js b/workflow/engine/templates/setup/environmentSettings.js index 1ffeba6a0..13ab13811 100755 --- a/workflow/engine/templates/setup/environmentSettings.js +++ b/workflow/engine/templates/setup/environmentSettings.js @@ -277,8 +277,14 @@ Ext.onReady(function() { waitMsg : _('ID_SAVING_ENVIRONMENT_SETTINGS')+'...', timeout : 36000, success : function(res, req) { - PMExt.notify(_('ID_PM_ENV_SETTINGS_TITLE'), req.result.msg); - saveButton.disable(); + PMExt.notify(_('ID_PM_ENV_SETTINGS_TITLE'), req.result.msg); + saveButton.disable(); + currentLocation = parent.parent.location.href; + //frame = parent.location.href; + //settingsPage = location.href; + //location = settingsPage; + //parent.location = frame; + parent.parent.location = currentLocation; } }); }