From cfe8047007797b5ea3629a0341a6aff217d6c82f Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 23 Oct 2014 14:04:44 +0200
Subject: [PATCH] no-jira: fix last step of bulk user import if the e-mail are
mandatory and the e-mail step is disabled
---
.../olat/admin/user/groups/GroupSearchController.java | 10 ++++++++--
.../java/org/olat/admin/user/imp/ImportStep02.java | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/admin/user/groups/GroupSearchController.java b/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
index 8094914754c..77ab791e1ae 100644
--- a/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
+++ b/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
@@ -90,6 +90,8 @@ public class GroupSearchController extends StepFormBasicController {
private String lastSearchValue;
@Autowired
private BusinessGroupService businessGroupService;
+
+ private boolean finishByFinish;
// constructor to be used like a normal FormBasicController
public GroupSearchController(UserRequest ureq, WindowControl wControl) {
@@ -100,9 +102,10 @@ public class GroupSearchController extends StepFormBasicController {
}
// constructor for use in steps-wizzard
- public GroupSearchController(UserRequest ureq, WindowControl wControl, Form form, StepsRunContext stepsRunContext) {
+ public GroupSearchController(UserRequest ureq, WindowControl wControl, Form form, StepsRunContext stepsRunContext, boolean finishByFinish) {
super(ureq, wControl, form, stepsRunContext, LAYOUT_VERTICAL, "resulttable");
Translator pT = Util.createPackageTranslator(BusinessGroupFormController.class, ureq.getLocale(), getTranslator());
+ this.finishByFinish = finishByFinish;
flc.setTranslator(pT);
initForm(ureq);
}
@@ -165,7 +168,10 @@ public class GroupSearchController extends StepFormBasicController {
@Override
protected void formFinish(UserRequest ureq) {
- //do nothing
+ if(finishByFinish) {
+ doSave(ureq);
+ fireEvent(ureq, StepsEvent.ACTIVATE_NEXT);
+ }
}
@Override
diff --git a/src/main/java/org/olat/admin/user/imp/ImportStep02.java b/src/main/java/org/olat/admin/user/imp/ImportStep02.java
index e975a912262..6a4d09754e7 100644
--- a/src/main/java/org/olat/admin/user/imp/ImportStep02.java
+++ b/src/main/java/org/olat/admin/user/imp/ImportStep02.java
@@ -71,7 +71,7 @@ public class ImportStep02 extends BasicStep {
*/
@Override
public StepFormController getStepController(UserRequest ureq, WindowControl windowControl, StepsRunContext stepsRunContext, Form form) {
- StepFormController stepI = new GroupSearchController(ureq, windowControl, form, stepsRunContext);
+ StepFormController stepI = new GroupSearchController(ureq, windowControl, form, stepsRunContext, mandatoryEmail);
return stepI;
}
}
\ No newline at end of file
--
GitLab