libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Fix pagination of searching users

Browse source
This commit is contained in:
mposolda 2014-08-25 21:13:50 +02:00
parent f51ba1cb8a
commit 3fdb22cb05
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java
View file

@ -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");
}
}

3
forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/users.js
View file

@ -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();
}

6
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-list.html
View file

@ -15,13 +15,13 @@
<div class="search-comp clearfix">
<input type="text" placeholder="Search..." data-ng-model="query.search" class="form-control search"
onkeyup="if(event.keyCode == 13){$(this).next('button').click();}">
<button data-ng-click="searchQuery()" type="submit"
<button data-ng-click="firstPage()" type="submit"
class="kc-icon-search" tooltip-placement="right"
tooltip="Search by full name, last name, email, or username.">
Icon: search
</button>
</div>
<span><span>or</span><button class="kc-link" ng-click="query.search = null; searchQuery()">View all users</button></span>
<span><span>or</span><button class="kc-link" ng-click="query.search = null; firstPage()">View all users</button></span>
<div class="pull-right">
<a class="btn btn-primary" href="#/create/user/{{realm.realm}}">Add User</a>
</div>
@ -36,7 +36,7 @@
</tr>
</tr>
</thead>
<tfoot data-ng-show="users && users.length > 5">
<tfoot data-ng-show="users && (users.length >= query.max || query.first > 0)">
<tr>
<td colspan="7">
<div class="table-nav">