External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 05:59:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

fixing socketservice init on login

Browse Source
This commit is contained in:
Jared Tabor
2016-09-06 18:01:31 -07:00
parent e35b5ef6fb
commit 813eeb9dd9
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/app.js
View File

@@ -29,7 +29,6 @@ import './helpers';
import './forms'; import './forms';
import './lists'; import './lists';
import './widgets'; import './widgets';
import './help';
import './filters'; import './filters';
import { Home } from './controllers/Home'; import { Home } from './controllers/Home';
import { SocketsController } from './controllers/Sockets'; import { SocketsController } from './controllers/Sockets';

7
awx/ui/client/src/help.js
View File

@@ -1,7 +0,0 @@
/*************************************************
* Copyright (c) 2015 Ansible, Inc.
*
* All Rights Reserved
*************************************************/
import "./help/InventoryGroups";

8
awx/ui/client/src/login/loginModal/loginModal.controller.js
View File

@@ -57,10 +57,11 @@
export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
'$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait', 'Timer', '$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait', 'Timer',
'Empty', 'ClearScope', '$scope', 'pendoService', 'ConfigService', 'Empty', 'ClearScope', '$scope', 'pendoService', 'ConfigService',
'CheckLicense', 'FeaturesService', 'CheckLicense', 'FeaturesService', 'SocketService',
function ($log, $cookieStore, $compile, $window, $rootScope, $location, function ($log, $cookieStore, $compile, $window, $rootScope, $location,
Authorization, ToggleClass, Alert, Wait, Timer, Empty, ClearScope, Authorization, ToggleClass, Alert, Wait, Timer, Empty, ClearScope,
scope, pendoService, ConfigService, CheckLicense, FeaturesService) { scope, pendoService, ConfigService, CheckLicense, FeaturesService,
SocketService) {
var lastPath, lastUser, sessionExpired, loginAgain; var lastPath, lastUser, sessionExpired, loginAgain;
loginAgain = function() { loginAgain = function() {
@@ -135,7 +136,8 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
Authorization.setUserInfo(data); Authorization.setUserInfo(data);
Timer.init().then(function(timer){ Timer.init().then(function(timer){
$rootScope.sessionTimer = timer; $rootScope.sessionTimer = timer;
$rootScope.$emit('OpenSocket'); // $rootScope.$emit('OpenSocket');
SocketService.init();
$rootScope.user_is_superuser = data.results[0].is_superuser; $rootScope.user_is_superuser = data.results[0].is_superuser;
$rootScope.user_is_system_auditor = data.results[0].is_system_auditor; $rootScope.user_is_system_auditor = data.results[0].is_system_auditor;
scope.$emit('AuthorizationGetLicense'); scope.$emit('AuthorizationGetLicense');