From 813eeb9dd9c5fb6061ffc4665ffc730e46069e60 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Tue, 6 Sep 2016 18:01:31 -0700
Subject: [PATCH] fixing socketservice init on login

---
 awx/ui/client/src/app.js                                  | 1 -
 awx/ui/client/src/help.js                                 | 7 -------
 .../client/src/login/loginModal/loginModal.controller.js  | 8 +++++---
 3 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 awx/ui/client/src/help.js

diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index c21bfca869..82279b427c 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -29,7 +29,6 @@ import './helpers';
 import './forms';
 import './lists';
 import './widgets';
-import './help';
 import './filters';
 import { Home } from './controllers/Home';
 import { SocketsController } from './controllers/Sockets';
diff --git a/awx/ui/client/src/help.js b/awx/ui/client/src/help.js
deleted file mode 100644
index 563ce5d460..0000000000
--- a/awx/ui/client/src/help.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import "./help/InventoryGroups";
diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
index 9bd5132ab1..020c64b1ca 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@@ -57,10 +57,11 @@
 export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
     '$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait', 'Timer',
     'Empty', 'ClearScope', '$scope', 'pendoService', 'ConfigService',
-    'CheckLicense', 'FeaturesService',
+    'CheckLicense', 'FeaturesService', 'SocketService',
     function ($log, $cookieStore, $compile, $window, $rootScope, $location,
         Authorization, ToggleClass, Alert, Wait, Timer, Empty, ClearScope,
-        scope, pendoService, ConfigService, CheckLicense, FeaturesService) {
+        scope, pendoService, ConfigService, CheckLicense, FeaturesService,
+        SocketService) {
     var lastPath, lastUser, sessionExpired, loginAgain;
 
     loginAgain = function() {
@@ -135,7 +136,8 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
                 Authorization.setUserInfo(data);
                 Timer.init().then(function(timer){
                     $rootScope.sessionTimer = timer;
-                    $rootScope.$emit('OpenSocket');
+                    // $rootScope.$emit('OpenSocket');
+                    SocketService.init();
                     $rootScope.user_is_superuser = data.results[0].is_superuser;
                     $rootScope.user_is_system_auditor = data.results[0].is_system_auditor;
                     scope.$emit('AuthorizationGetLicense');