Skip to content
Snippets Groups Projects
Commit e6fea248 authored by Moritz Strohm's avatar Moritz Strohm
Browse files

fixed default_subject in course/members/circular_mail action, re #1622

Merge request studip/studip!1044
parent a751db08
No related branches found
No related tags found
No related merge requests found
...@@ -1834,6 +1834,8 @@ class Course_MembersController extends AuthenticatedController ...@@ -1834,6 +1834,8 @@ class Course_MembersController extends AuthenticatedController
$this->tutor_name = get_title_for_status('tutor', 0, $sem->status); $this->tutor_name = get_title_for_status('tutor', 0, $sem->status);
$this->dozent_name = get_title_for_status('dozent', 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) { if ($this->is_tutor) {
$this->awaiting_count = AdmissionApplication::countBySql( $this->awaiting_count = AdmissionApplication::countBySql(
"seminar_id = :course_id AND status = 'awaiting'", "seminar_id = :course_id AND status = 'awaiting'",
...@@ -1875,7 +1877,7 @@ class Course_MembersController extends AuthenticatedController ...@@ -1875,7 +1877,7 @@ class Course_MembersController extends AuthenticatedController
'dispatch.php/messages/write', 'dispatch.php/messages/write',
[ [
'course_id' => $this->course_id, 'course_id' => $this->course_id,
'default_subject' => $this->subject, 'default_subject' => $this->default_subject,
'filter' => 'all', 'filter' => 'all',
'emailrequest' => 1 'emailrequest' => 1
] ]
...@@ -1885,7 +1887,7 @@ class Course_MembersController extends AuthenticatedController ...@@ -1885,7 +1887,7 @@ class Course_MembersController extends AuthenticatedController
'dispatch.php/messages/write', 'dispatch.php/messages/write',
[ [
'course_id' => $this->course_id, 'course_id' => $this->course_id,
'default_subject' => $this->subject, 'default_subject' => $this->default_subject,
'filter' => 'really_all', 'filter' => 'really_all',
'emailrequest' => 1 'emailrequest' => 1
] ]
...@@ -1924,7 +1926,7 @@ class Course_MembersController extends AuthenticatedController ...@@ -1924,7 +1926,7 @@ class Course_MembersController extends AuthenticatedController
$url_params = [ $url_params = [
'course_id' => $this->course_id, 'course_id' => $this->course_id,
'default_subject' => $this->subject, 'default_subject' => $this->default_subject,
'filter' => implode(',', array_unique($filters)), 'filter' => implode(',', array_unique($filters)),
'emailrequest' => 1 'emailrequest' => 1
]; ];
......
<form class="default" method="post" action="<?= $controller->link_for('course/members/circular_mail') ?>" <form class="default" method="post" action="<?= $controller->link_for('course/members/circular_mail') ?>"
data-dialog="size=default"> data-dialog="size=default">
<?= CSRFProtection::tokenTag() ?> <?= CSRFProtection::tokenTag() ?>
<input type="hidden" name="default_subject" value="<?= htmlReady($default_subject) ?>">
<fieldset> <fieldset>
<legend><?= _('An wen möchten Sie eine Rundmail schreiben?') ?></legend> <legend><?= _('An wen möchten Sie eine Rundmail schreiben?') ?></legend>
<p aria-hidden="true"><?= _('An wen möchten Sie eine Rundmail schreiben?') ?></p> <p aria-hidden="true"><?= _('An wen möchten Sie eine Rundmail schreiben?') ?></p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment