From dbeba7a4ac66372b3c77c88ebd45eb1abb045bfe Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Fri, 31 May 2019 16:06:44 +0200
Subject: [PATCH] OO-4065: RS when searching a user
---
.../org/olat/user/ui/admin/UserSearchTableController.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/user/ui/admin/UserSearchTableController.java b/src/main/java/org/olat/user/ui/admin/UserSearchTableController.java
index 1eaea4f56ea..e9cae0b4027 100644
--- a/src/main/java/org/olat/user/ui/admin/UserSearchTableController.java
+++ b/src/main/java/org/olat/user/ui/admin/UserSearchTableController.java
@@ -166,9 +166,8 @@ public class UserSearchTableController extends FormBasicController implements Ac
if(roles.isAdministrator() || roles.isUserManager() || roles.isRolesManager()) {
bulkChangesButton = uifactory.addFormLink("bulkChange.title", formLayout, Link.BUTTON);
}
- if(bulkOrganisationMove) {
- bulkMovebutton = uifactory.addFormLink("command.move.to.organisation", formLayout, Link.BUTTON);
- }
+ bulkMovebutton = uifactory.addFormLink("command.move.to.organisation", formLayout, Link.BUTTON);
+ bulkMovebutton.setVisible(bulkOrganisationMove);
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
if(isAdministrativeUser) {
@@ -211,7 +210,8 @@ public class UserSearchTableController extends FormBasicController implements Ac
UserSearchDataSource dataSource = new UserSearchDataSource(params, userPropertyHandlers, getLocale());
tableModel.setSource(dataSource);
tableEl.reset(true, true, true);
- bulkMovebutton.setVisible(currentSearchParams != null
+ bulkMovebutton.setVisible(bulkOrganisationMove
+ && currentSearchParams != null
&& currentSearchParams.getOrganisations() != null
&& currentSearchParams.getOrganisations().size() == 1);
}
--
GitLab