From 539c4fe2cffb1cddee97a60c482815b86b78b031 Mon Sep 17 00:00:00 2001 From: hjonathan Date: Mon, 19 Jun 2017 16:21:40 -0400 Subject: [PATCH 1/3] HOR-3374 --- workflow/engine/methods/login/authentication.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php index c82847df5..83afd90ce 100644 --- a/workflow/engine/methods/login/authentication.php +++ b/workflow/engine/methods/login/authentication.php @@ -438,8 +438,7 @@ try { $oPluginRegistry->executeTriggers ( PM_AFTER_LOGIN , $_SESSION['USER_LOGGED'] ); } - G::RenderPage('publish', 'extJs'); - //G::header('Location: ' . $sLocation); + G::header('Location: ' . $sLocation); die; } catch ( Exception $e ) { $aMessage['MESSAGE'] = $e->getMessage(); From 1a06a73b7ff4e45b230c382fb192d0fb18d468a3 Mon Sep 17 00:00:00 2001 From: hjonathan Date: Thu, 22 Jun 2017 15:25:30 -0400 Subject: [PATCH 2/3] The unused code has been removed --- workflow/engine/methods/login/authentication.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php index 83afd90ce..6fbcef6f9 100644 --- a/workflow/engine/methods/login/authentication.php +++ b/workflow/engine/methods/login/authentication.php @@ -427,12 +427,6 @@ try { setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/'); } - $oHeadPublisher = &headPublisher::getSingleton(); - $oHeadPublisher->extJsInit = true; - - $oHeadPublisher->addExtJsScript('login/init', false); //adding a javascript file .js - $oHeadPublisher->assign('uriReq', $sLocation); - $oPluginRegistry =& PMPluginRegistry::getSingleton(); if ($oPluginRegistry->existsTrigger ( PM_AFTER_LOGIN )) { $oPluginRegistry->executeTriggers ( PM_AFTER_LOGIN , $_SESSION['USER_LOGGED'] ); From 08aee57a1ba9f481c81d7e983999ae6a7613c0c8 Mon Sep 17 00:00:00 2001 From: hjonathan Date: Thu, 22 Jun 2017 16:01:44 -0400 Subject: [PATCH 3/3] remove login/init.js --- workflow/engine/templates/login/init.js | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 workflow/engine/templates/login/init.js diff --git a/workflow/engine/templates/login/init.js b/workflow/engine/templates/login/init.js deleted file mode 100644 index c0f129a4d..000000000 --- a/workflow/engine/templates/login/init.js +++ /dev/null @@ -1,14 +0,0 @@ -Ext.onReady(function(){ - location.href = uriReq; - - var hideMask = function () { - Ext.get('loading').remove(); - Ext.fly('loading-mask').fadeOut({ - remove:true, - callback : '' - }); - } - - hideMask.defer(250); - -});