From 19a8c377188e661595f0ed4a8652d1f9ac7bf1a3 Mon Sep 17 00:00:00 2001 From: ralpheav Date: Thu, 23 May 2013 16:45:38 -0400 Subject: [PATCH 1/2] BUG 11979: "Cambios en el skin, la fecha en el mensaje de bienvenida en la esquina superior..." Sol Adding time in the format string + update the entire page, caused the user & datetime are been called in the main request. --- workflow/engine/skinEngine/skinEngine.php | 4 ++-- .../engine/templates/setup/environmentSettings.js | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) 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 6d02e12c9..6726458af 100755 --- a/workflow/engine/templates/setup/environmentSettings.js +++ b/workflow/engine/templates/setup/environmentSettings.js @@ -274,8 +274,15 @@ 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; } }); } From d29f0fa4024cd3d12559adcec9af497d3d515105 Mon Sep 17 00:00:00 2001 From: ralpheav Date: Fri, 24 May 2013 11:40:12 -0400 Subject: [PATCH 2/2] BUG 11979: "Cambios en el skin, la fecha en el mensaje de bienvenida en la esquina superior..." Sol Adding time in the format string + update the entire page, caused the user & datetime are been called in the main request. --- workflow/engine/templates/setup/environmentSettings.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/workflow/engine/templates/setup/environmentSettings.js b/workflow/engine/templates/setup/environmentSettings.js index 6726458af..1f6552be3 100755 --- a/workflow/engine/templates/setup/environmentSettings.js +++ b/workflow/engine/templates/setup/environmentSettings.js @@ -277,11 +277,10 @@ Ext.onReady(function() { 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; + //frame = parent.location.href; + //settingsPage = location.href; + //location = settingsPage; + //parent.location = frame; parent.parent.location = currentLocation; } });