Skip to content
Snippets Groups Projects
Commit 7ef05b64 authored by srosse's avatar srosse
Browse files

OO-2376: add the possibility to "bulk" create groups in several places

parent 0bb86e4e
No related branches found
No related tags found
No related merge requests found
...@@ -188,8 +188,8 @@ public class NewBGController extends BasicController { ...@@ -188,8 +188,8 @@ public class NewBGController extends BasicController {
* @return the new groups. * @return the new groups.
*/ */
public Set<BusinessGroup> getCreatedGroups(){ public Set<BusinessGroup> getCreatedGroups(){
Set<BusinessGroup> groupSet = new HashSet<BusinessGroup>(newGroups); Set<BusinessGroup> groupSet = new HashSet<BusinessGroup>();
if(newGroups == null) { if(newGroups != null) {
groupSet.addAll(newGroups); groupSet.addAll(newGroups);
} }
return groupSet; return groupSet;
......
...@@ -438,8 +438,12 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr ...@@ -438,8 +438,12 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr
} else if (source == groupCreateController) { } else if (source == groupCreateController) {
BusinessGroup group = null; BusinessGroup group = null;
if(event == Event.DONE_EVENT) { if(event == Event.DONE_EVENT) {
group = groupCreateController.getCreatedGroup(); Set<BusinessGroup> groups = groupCreateController.getCreatedGroups();
if(group != null) { if(groups.size() == 1) {
group = groups.iterator().next();
}
if(groups.size() > 0) {
tableEl.deselectAll(); tableEl.deselectAll();
reloadModel(); reloadModel();
} }
...@@ -633,7 +637,7 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr ...@@ -633,7 +637,7 @@ public abstract class AbstractBusinessGroupListController extends FormBasicContr
*/ */
protected void doCreate(UserRequest ureq, WindowControl wControl, RepositoryEntry re) { protected void doCreate(UserRequest ureq, WindowControl wControl, RepositoryEntry re) {
removeAsListenerAndDispose(groupCreateController); removeAsListenerAndDispose(groupCreateController);
groupCreateController = new NewBGController(ureq, wControl, re, false, null); groupCreateController = new NewBGController(ureq, wControl, re, true, null);
listenTo(groupCreateController); listenTo(groupCreateController);
cmc = new CloseableModalController(getWindowControl(), translate("close"), groupCreateController.getInitialComponent(), true, translate("create.form.title")); cmc = new CloseableModalController(getWindowControl(), translate("close"), groupCreateController.getInitialComponent(), true, translate("create.form.title"));
......
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