From af2b59902e50264a9a34f4ca0a5bdf06ecc13b8d Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 8 Jan 2018 10:43:25 -0500
Subject: #499 - fix case when you try and configure ES before logging into
 portal (first setup)

---
 www/js/LoginCtrl.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'www/js/LoginCtrl.js')

diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index b27a1203..7956950b 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -249,8 +249,25 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
         NVRDataModel.debug("Saving settings before going to Event Server settings");
         //console.log ( "My loginData saved " + JSON.stringify($scope.loginData));
         NVRDataModel.setLogin($scope.loginData);
-        $state.go("app.eventserversettings");
-        return;
+
+
+        if (!$rootScope.isLoggedIn) {
+            $rootScope.zmPopup = $ionicPopup.alert(
+                {
+                    title: $translate.instant('kError'),
+                    template: $translate.instant('kEventServerNotLoggedIn'),
+                    okText: $translate.instant('kButtonOk'),
+                    cancelText: $translate.instant('kButtonCancel'),
+                });
+                return;            
+
+        }
+        else {
+            $state.go("app.eventserversettings");
+            return;
+        }
+
+        
     };
 
     //-------------------------------------------------------------------------
-- 
cgit v1.2.3