External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2648 from jaredevantabor/idle-modal

Browse Source 
Slight tweak for when session timer expires
This commit is contained in:
Jared Tabor 2016-06-27 09:26:33 -07:00 committed by GitHub
commit 6bc025c86f
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
awx/ui/client/src/login/authenticationServices/timer.factory.js
View File

@ -110,6 +110,23 @@ export default
this.clearTimers();
$rootScope.expireTimer = $interval(function() {
var idle = that.isIdle();
if (that.isExpired(true)) {
if($('#idle-modal').is(':visible')){
if($('#idle-modal').dialog('isOpen')){
$('#idle-modal').dialog('close');
}
}
that.expireSession('idle');
$state.go('signOut');
return;
}
if(Store('sessionTime') &&
Store('sessionTime')[$rootScope.current_user.id] &&
Store('sessionTime')[$rootScope.current_user.id].loggedIn === false){
that.expireSession();
$state.go('signOut');
return;
}
if(idle !== false){
if($('#idle-modal').is(':visible')){
$('#remaining_seconds').html(Math.round(idle));
@ -152,20 +169,7 @@ export default
$('#idle-modal').dialog('close');
}
}
if (that.isExpired(true)) {
if($('#idle-modal').dialog('isOpen')){
$('#idle-modal').dialog('close');
}
that.expireSession('idle');
$state.go('signOut');
}
if(Store('sessionTime') &&
Store('sessionTime')[$rootScope.current_user.id] &&
Store('sessionTime')[$rootScope.current_user.id].loggedIn === false){
that.expireSession();
$state.go('signOut');
}
}, 1000);