From e6fea248e6b166bff7811a2dd4f0a836c3fbf3b6 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 30 Sep 2022 08:05:10 +0000
Subject: [PATCH] fixed default_subject in course/members/circular_mail action,
re #1622
Merge request studip/studip!1044
---
app/controllers/course/members.php | 8 +++++---
app/views/course/members/circular_mail.php | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php
index 00bdab12c98..bad1d8ebbdd 100644
--- a/app/controllers/course/members.php
+++ b/app/controllers/course/members.php
@@ -1834,6 +1834,8 @@ class Course_MembersController extends AuthenticatedController
$this->tutor_name = get_title_for_status('tutor', 0, $sem->status);
$this->dozent_name = get_title_for_status('dozent', 0, $sem->status);
+ $this->default_subject = Request::get('default_subject');
+
if ($this->is_tutor) {
$this->awaiting_count = AdmissionApplication::countBySql(
"seminar_id = :course_id AND status = 'awaiting'",
@@ -1875,7 +1877,7 @@ class Course_MembersController extends AuthenticatedController
'dispatch.php/messages/write',
[
'course_id' => $this->course_id,
- 'default_subject' => $this->subject,
+ 'default_subject' => $this->default_subject,
'filter' => 'all',
'emailrequest' => 1
]
@@ -1885,7 +1887,7 @@ class Course_MembersController extends AuthenticatedController
'dispatch.php/messages/write',
[
'course_id' => $this->course_id,
- 'default_subject' => $this->subject,
+ 'default_subject' => $this->default_subject,
'filter' => 'really_all',
'emailrequest' => 1
]
@@ -1924,7 +1926,7 @@ class Course_MembersController extends AuthenticatedController
$url_params = [
'course_id' => $this->course_id,
- 'default_subject' => $this->subject,
+ 'default_subject' => $this->default_subject,
'filter' => implode(',', array_unique($filters)),
'emailrequest' => 1
];
diff --git a/app/views/course/members/circular_mail.php b/app/views/course/members/circular_mail.php
index 51a759848fb..725be878d2a 100644
--- a/app/views/course/members/circular_mail.php
+++ b/app/views/course/members/circular_mail.php
@@ -1,6 +1,7 @@
<form class="default" method="post" action="<?= $controller->link_for('course/members/circular_mail') ?>"
data-dialog="size=default">
<?= CSRFProtection::tokenTag() ?>
+ <input type="hidden" name="default_subject" value="<?= htmlReady($default_subject) ?>">
<fieldset>
<legend><?= _('An wen möchten Sie eine Rundmail schreiben?') ?></legend>
<p aria-hidden="true"><?= _('An wen möchten Sie eine Rundmail schreiben?') ?></p>
--
GitLab