From 8dc7290fcf2daea461f4ed949042ad3373ff65f9 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 4 Mar 2013 11:41:04 +0100
Subject: [PATCH] OO-549: move the error message in the main controller instead
of the contact controller to prevent popup in popup
---
.../org/olat/course/member/_i18n/LocalStrings_de.properties | 1 +
.../org/olat/course/member/_i18n/LocalStrings_en.properties | 1 +
.../org/olat/group/ui/edit/_i18n/LocalStrings_de.properties | 3 ++-
.../org/olat/group/ui/edit/_i18n/LocalStrings_en.properties | 2 ++
.../org/olat/group/ui/main/AbstractMemberListController.java | 4 ++++
.../org/olat/group/ui/main/_i18n/LocalStrings_de.properties | 3 ++-
.../org/olat/group/ui/main/_i18n/LocalStrings_en.properties | 2 ++
.../repository/controllers/_i18n/LocalStrings_de.properties | 4 +++-
.../repository/controllers/_i18n/LocalStrings_en.properties | 2 ++
9 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties
index ddc2a6ddff3..e530215d8c0 100644
--- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties
@@ -16,6 +16,7 @@ edit.member.groups.desc=F\u00FCgen Sie den Benutzer den unten aufgef\u00FChrten
edit.member.repo.desc=F\u00FCgen Sie den Benutzer dem Kurs hinzu als\:
edit.member.title=Mitgliederrechte Kurs "{0}"
error.atleastone=$org.olat.group.ui.main\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
group.add=Gruppe hinzuf\u00FCgen
group.create=Gruppe erstellen
group.remove=$org.olat.group.ui.edit\:resource.remove
diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties
index aec25736f55..cf24b7acb39 100644
--- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties
@@ -16,6 +16,7 @@ edit.member.groups.desc=Add user to the groups below by selecting the appropriat
edit.member.repo.desc=Add user to the course as\:
edit.member.title=Member right for the course "{0}"
error.atleastone=$org.olat.group.ui.main\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
group.add=Add group
group.create=Create group
group.remove=$org.olat.group.ui.edit\:resource.remove
diff --git a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
index b9f86a5fd37..01af785c5a0 100644
--- a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
@@ -76,6 +76,7 @@ chkBox.open=Gruppe f
chkBox.open.downloadList=Benutzer dürfen Teilnehmerliste herunterladen
cmd.addresource=Kurs hinzuf\u00FCgen
error.message.locked=Diese Gruppe wird im Moment vom Benutzer {0} ({1}) ver\u00E4ndert und ist daher gesperrt. Bitte versuchen Sie es sp\u00E4ter noch einmal.
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
fieldset.legend.areas=Zugewiesene Lernbereiche
fieldset.legend.collabtools=Kollaborative Werkzeuge
fieldset.legend.details=Details
@@ -109,7 +110,7 @@ edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
import.member=$org.olat.group.ui.main\:import.member
home=$org.olat.group.ui.main\:home
assessment=$org.olat.group.ui.main\:assessment
-
+mail.member=$org.olat.group.ui.main\:mail.member
table.header.edit=$org.olat.group.ui.main\:table.header.edit
table.header.remove=$org.olat.group.ui.main\:table.header.remove
table.header.graduate=$org.olat.group.ui.main\:table.header.graduate
diff --git a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
index 123ef061d26..b76171338b6 100644
--- a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
@@ -73,6 +73,7 @@ dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
edit.member=$org.olat.group.ui.main\:edit.member
edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
error.message.locked=This group is being edited by user {0} ({1}) and therefore locked. Please try again later.
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
fieldset.legend.areas=Assigned learning areas
fieldset.legend.collabtools=Collaborative tools
fieldset.legend.details=Details
@@ -103,6 +104,7 @@ help.hover.bgGrpResources=Help regarding courses of groups
help.hover.bgRights=Help regarding rights of a group
home=$org.olat.group.ui.main\:home
import.member=$org.olat.group.ui.main\:import.member
+mail.member=$org.olat.group.ui.main\:mail.member
nomembers=$org.olat.group.ui.main\:nomembers
resource.remove=Do you really want to remove the group "{0}" from course "{1}"? The group and the course are not deleted with this action. You can add the relation between them at any time.
resources.add=Link course
diff --git a/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java b/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
index 1728d9c8918..eac307b23fb 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
@@ -453,6 +453,10 @@ public abstract class AbstractMemberListController extends BasicController imple
protected void doSendMail(UserRequest ureq, List<MemberView> members) {
List<Long> identityKeys = getMemberKeys(members);
List<Identity> identities = securityManager.loadIdentityByKeys(identityKeys);
+ if(identities.isEmpty()) {
+ showWarning("error.msg.send.no.rcps");
+ return;
+ }
ContactMessage contactMessage = new ContactMessage(getIdentity());
String name = repoEntry != null ? repoEntry.getDisplayname() : businessGroup.getName();
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
index 338669ba10b..65381f9f79c 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
@@ -20,7 +20,8 @@ dialog.modal.bg.send.mail=Wollen Sie die betroffene(n) Person(en) per E-mail ben
remove.send.mail=Benachrichtigung
remove.send.mail.label=E-mail versenden
error.atleastone=Es muss mindestens ein Besitzer in der Kurs sein.
-
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
+mail.member=E-Mail
main.menu.title=Gruppen
main.menu.title.alt=Gruppen
index.header=Gruppen
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
index e4157da6448..a1f2c8276e0 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
@@ -40,6 +40,7 @@ edit.member.groups=Group memberships
edit.member.title=Member rights course {0}
email.group=Send E-mail
error.atleastone=At least one owner is required in a course.
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
group.access.success=Access to group is successful
group.used.in.course=This group is used in the following courses\:
hide=Hide information
@@ -49,6 +50,7 @@ index.header=Groups
index.intro=The following list shows all groups, learning groups, and right groups you participate in.
index.table.nogroup=You are not registered in any group.
info.group.deleted=This group has been deleted.
+mail.member=E-Mail
main.menu.title=Groups
main.menu.title.alt=Groups
marked.groups=Bookmark
diff --git a/src/main/java/org/olat/repository/controllers/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/repository/controllers/_i18n/LocalStrings_de.properties
index 20de6a2e1d8..8710eb14772 100644
--- a/src/main/java/org/olat/repository/controllers/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/repository/controllers/_i18n/LocalStrings_de.properties
@@ -3,6 +3,7 @@ add.member=$org.olat.group.ui.main\:add.member
edit.member=$org.olat.group.ui.main\:edit.member
edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
error.atleastone=$org.olat.course.member\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
import.member=$org.olat.group.ui.main\:import.member
home=$org.olat.group.ui.main\:home
assessment=$org.olat.group.ui.main\:assessment
@@ -26,4 +27,5 @@ table.header.participants=$org.olat.group.ui.main\:table.header.participants
table.header.waitingList=$org.olat.group.ui.main\:table.header.waitingList
dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
dialog.modal.bg.leave.text=$org.olat.group.ui.main\:dialog.modal.bg.leave.text
-nomembers=XXX No members
\ No newline at end of file
+nomembers=XXX No members
+mail.member=$org.olat.group.ui.main\:mail.member
\ No newline at end of file
diff --git a/src/main/java/org/olat/repository/controllers/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/repository/controllers/_i18n/LocalStrings_en.properties
index 9a4175444df..70f714b66ab 100644
--- a/src/main/java/org/olat/repository/controllers/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/repository/controllers/_i18n/LocalStrings_en.properties
@@ -6,9 +6,11 @@ dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
edit.member=$org.olat.group.ui.main\:edit.member
edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
error.atleastone=$org.olat.course.member\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
home=$org.olat.group.ui.main\:home
import.member=$org.olat.group.ui.main\:import.member
nomembers=XXX No members
+mail.member=$org.olat.group.ui.main\:mail.member
table.header.online=$org.olat.group.ui.main\:table.header.online
table.header.edit=$org.olat.group.ui.main\:table.header.edit
table.header.firstName=$org.olat.group.ui.main\:table.header.firstName
--
GitLab