From 3fdb22cb05398ec546d0e5b41512b7827a620891 Mon Sep 17 00:00:00 2001 From: mposolda Date: Mon, 25 Aug 2014 21:13:50 +0200 Subject: [PATCH] Fix pagination of searching users --- .../keycloak/federation/ldap/LDAPFederationProvider.java | 2 +- .../theme/admin/base/resources/js/controllers/users.js | 3 --- .../theme/admin/base/resources/partials/user-list.html | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java index 85a049ff1c..ad3b235970 100755 --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java @@ -225,7 +225,7 @@ public class LDAPFederationProvider implements UserFederationProvider { } else if (agents.size() == 1) { return agents.get(0); } else { - throw new IdentityManagementException("Error - multiple Agent objects found with same login name"); + throw new IdentityManagementException("Error - multiple Agent objects found with same email"); } } diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/users.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/users.js index 80634cf0a2..8543323b21 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/users.js +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/users.js @@ -149,9 +149,6 @@ module.controller('UserListCtrl', function($scope, realm, User) { $scope.firstPage = function() { $scope.query.first = 0; - if ($scope.query.first < 0) { - $scope.query.first = 0; - } $scope.searchQuery(); } diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-list.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-list.html index af22f865b8..3fdd481ced 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-list.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-list.html @@ -15,13 +15,13 @@
-
- or + or
Add User
@@ -36,7 +36,7 @@ - +