From 874727f9278e214a8a1b739e74b6b973b46a2acf Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 26 Nov 2013 13:50:10 +0000 Subject: [PATCH] Fixes to user search --- .../META-INF/resources/admin/js/controllers/users.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js index ffd9355ef1..0d4f4e87d1 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/users.js @@ -119,12 +119,15 @@ module.controller('UserRoleMappingCtrl', function($scope, $http, realm, user, ro module.controller('UserListCtrl', function($scope, realm, User) { $scope.realm = realm; $scope.searchQuery = function() { - $scope.currentSearch = $scope.search; $scope.searchLoaded = false; if ($scope.search) { + $scope.currentSearch = $scope.search; $scope.users = User.query({ realm: realm.id, search : $scope.search }, function() { $scope.searchLoaded = true; }); + } else { + $scope.currentSearch = null; + $scope.users = null; } }; });