correctiond for admin-portal

OpenOlitor · Jun 19, 2020 · 42ef2ef · 42ef2ef
1 parent f4b08c2
commit 42ef2ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/scripts/login/login.controller.js b/app/scripts/login/login.controller.js
@@ -4,9 +4,9 @@
  */
 angular.module('openolitor-core')
   .controller('LoginController', ['$scope', '$rootScope', '$http',
-    'appConfig', 'ENV', 'gettext', '$rootElement',
+    'appConfig', 'gettext', '$rootElement',
     'alertService', '$timeout', '$location', '$route', '$routeParams', 'ooAuthService', '$interval',
-    function($scope, $rootScope, $http, appConfig, ENV, gettext, $rootElement,
+    function($scope, $rootScope, $http, appConfig, gettext, $rootElement,
       alertService, $timeout, $location, $route, $routeParams, ooAuthService, $interval) {
       $scope.loginData = {};
       $scope.submitted = false;
@@ -23,7 +23,7 @@ angular.module('openolitor-core')
         token: undefined
       };
       $scope.status = 'login';
-      $scope.env = ENV;
+      $scope.env = appConfig.get().ENV;
       $scope.secondFactorCountdown = 600;
       $scope.secondFactorCountdownDate = function() {
         return moment().add($scope.secondFactorCountdown, 'seconds');

diff --git a/app/scripts/root.js b/app/scripts/root.js
@@ -6,10 +6,10 @@ angular.module('openolitor-core')
   .controller('OpenOlitorRootController', ['$scope', '$rootScope',
     'ServerService', 'ProjektService', 'gettextCatalog', 'amMoment',
     '$location', 'msgBus', 'checkSize', '$window', '$timeout', 'BUILD_NR',
-    'ENV', 'ooAuthService', '$cookies',
+    'ooAuthService', '$cookies',
     function($scope, $rootScope, ServerService, ProjektService,
       gettextCatalog, amMoment, $location, msgBus, checkSize, $window,
-      $timeout, BUILD_NR, ENV, ooAuthService, $cookies) {
+      $timeout, BUILD_NR, ooAuthService, $cookies) {
       angular.element($window).bind('resize', function() {
         checkSize();
       });
@@ -52,7 +52,7 @@ angular.module('openolitor-core')
         });
 
       $scope.buildNr = BUILD_NR;
-      $scope.env = ENV;
+      $scope.env = appConfig.get().ENV;
 
       msgBus.onMsg('WebSocketClosed', $rootScope, function(event, msg) {
         $scope.connected = false;

diff --git a/dist/scripts/openolitor-core.js b/dist/scripts/openolitor-core.js