Skip to content
Snippets Groups Projects
Commit 30ae6bdf authored by srosse's avatar srosse
Browse files

OO-2459: send the invitation in portfolio with the email of the user

parent 425c18d9
No related branches found
No related tags found
No related merge requests found
......@@ -47,7 +47,6 @@ import org.olat.core.helpers.Settings;
import org.olat.core.id.Identity;
import org.olat.core.id.UserConstants;
import org.olat.core.util.StringHelper;
import org.olat.core.util.WebappHelper;
import org.olat.core.util.mail.ContactList;
import org.olat.core.util.mail.MailBundle;
import org.olat.core.util.mail.MailContext;
......@@ -360,7 +359,7 @@ public class InvitationEditRightsController extends FormBasicController {
MailContext context = new MailContextImpl(binder, null, getWindowControl().getBusinessControl().getAsString());
MailBundle bundle = new MailBundle();
bundle.setContext(context);
bundle.setFrom(WebappHelper.getMailConfig("mailReplyTo"));
bundle.setFromId(getIdentity());
bundle.setContactList(contactList);
bundle.setContent(translate("invitation.mail.subject"), translate("invitation.mail.body", bodyArgs));
......
......@@ -47,7 +47,6 @@ import org.olat.core.gui.control.generic.wizard.StepsMainRunController;
import org.olat.core.gui.control.generic.wizard.StepsRunContext;
import org.olat.core.id.Identity;
import org.olat.core.util.StringHelper;
import org.olat.core.util.WebappHelper;
import org.olat.core.util.mail.ContactList;
import org.olat.core.util.mail.MailBundle;
import org.olat.core.util.mail.MailContext;
......@@ -404,7 +403,7 @@ public class PublishController extends BasicController implements TooledControll
MailContext context = new MailContextImpl(binder, null, getWindowControl().getBusinessControl().getAsString());
MailBundle bundle = new MailBundle();
bundle.setContext(context);
bundle.setFrom(WebappHelper.getMailConfig("mailReplyTo"));
bundle.setFromId(getIdentity());
bundle.setContactList(contactList);
bundle.setContent(mailTemplate.getSubjectTemplate(), mailTemplate.getBodyTemplate());
MailerResult result = mailManager.sendMessage(bundle);
......
......@@ -93,7 +93,6 @@ public class MemberMailController extends StepFormBasicController {
subjectEl.setMandatory(true);
bodyEl = uifactory.addTextAreaElement("bodyElem", "mail.body", -1, 15, 60, true, mailTemplate.getBodyTemplate(), formLayout);
bodyEl.setHelpText(translate("mailtemplateform.body.hover"));
bodyEl.setHelpUrlForManualPage("E-Mail");
bodyEl.setMandatory(true);
}
......
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