Skip to content
Snippets Groups Projects
Commit dbeba7a4 authored by uhensler's avatar uhensler
Browse files

OO-4065: RS when searching a user

parent 08d57212
No related branches found
No related tags found
No related merge requests found
...@@ -166,9 +166,8 @@ public class UserSearchTableController extends FormBasicController implements Ac ...@@ -166,9 +166,8 @@ public class UserSearchTableController extends FormBasicController implements Ac
if(roles.isAdministrator() || roles.isUserManager() || roles.isRolesManager()) { if(roles.isAdministrator() || roles.isUserManager() || roles.isRolesManager()) {
bulkChangesButton = uifactory.addFormLink("bulkChange.title", formLayout, Link.BUTTON); 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(); FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
if(isAdministrativeUser) { if(isAdministrativeUser) {
...@@ -211,7 +210,8 @@ public class UserSearchTableController extends FormBasicController implements Ac ...@@ -211,7 +210,8 @@ public class UserSearchTableController extends FormBasicController implements Ac
UserSearchDataSource dataSource = new UserSearchDataSource(params, userPropertyHandlers, getLocale()); UserSearchDataSource dataSource = new UserSearchDataSource(params, userPropertyHandlers, getLocale());
tableModel.setSource(dataSource); tableModel.setSource(dataSource);
tableEl.reset(true, true, true); tableEl.reset(true, true, true);
bulkMovebutton.setVisible(currentSearchParams != null bulkMovebutton.setVisible(bulkOrganisationMove
&& currentSearchParams != null
&& currentSearchParams.getOrganisations() != null && currentSearchParams.getOrganisations() != null
&& currentSearchParams.getOrganisations().size() == 1); && currentSearchParams.getOrganisations().size() == 1);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment