Fix wrong agent id parsing when come from groups twice

wazuh · Feb 22, 2018 · 188793b · 188793b
1 parent 32b4620
commit 188793b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/public/controllers/agents.js b/public/controllers/agents.js
@@ -149,7 +149,7 @@ function ($scope, $location, $q, $rootScope, appState, genericReq, apiReq, Agent
                 id = newAgentId;
                 $location.search('agent', id);
             } else {
-                if ($location.search().agent) { // There's one in the url
+                if ($location.search().agent && !$rootScope.globalAgent) { // There's one in the url
                     id = $location.search().agent;
                 } else { // We pick the one in the rootScope
                     id = $rootScope.globalAgent;
@@ -288,7 +288,7 @@ function ($scope, $location, $q, $rootScope, appState, genericReq, apiReq, Agent
             $scope.configurationError = false;
             $scope.load = true;
             let id;
-            if ($location.search().agent) { // There's one in the url
+            if ($location.search().agent && !$rootScope.globalAgent) { // There's one in the url
 				id = $location.search().agent;
 			} else { // We pick the one in the rootScope
 				id = $rootScope.globalAgent;