fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in develop (pull request #5790)

Browse Source 
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-07-11 13:07:43 +00:00
parent 966c2890fe 5b9d5cd8a4
commit 1cb5482b4f
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/methods/login/authentication.php
View File

@@ -427,19 +427,12 @@ try {
setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/'); 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(); $oPluginRegistry =& PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger ( PM_AFTER_LOGIN )) { if ($oPluginRegistry->existsTrigger ( PM_AFTER_LOGIN )) {
$oPluginRegistry->executeTriggers ( PM_AFTER_LOGIN , $_SESSION['USER_LOGGED'] ); $oPluginRegistry->executeTriggers ( PM_AFTER_LOGIN , $_SESSION['USER_LOGGED'] );
} }
G::RenderPage('publish', 'extJs'); G::header('Location: ' . $sLocation);
//G::header('Location: ' . $sLocation);
die; die;
} catch ( Exception $e ) { } catch ( Exception $e ) {
$aMessage['MESSAGE'] = $e->getMessage(); $aMessage['MESSAGE'] = $e->getMessage();

14
workflow/engine/templates/login/init.js
View File

@@ -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);
});