Skip to content
Snippets Groups Projects
Commit a313f025 authored by Thomas Hackl's avatar Thomas Hackl
Browse files

Resolve "Einer Massenmail zugeordnete Filter werden nicht gespeichert"

Closes #4901

Merge request studip/studip!3675
parent cdc7050e
No related branches found
No related tags found
No related merge requests found
...@@ -48,8 +48,8 @@ class Massmail_MessageController extends \AuthenticatedController ...@@ -48,8 +48,8 @@ class Massmail_MessageController extends \AuthenticatedController
'if' => 'target === "students"', 'if' => 'target === "students"',
'context' => 'MassMail', 'context' => 'MassMail',
'target' => 'students', 'target' => 'students',
':key' => 'NaN',
'store' => function($value, $input) { 'store' => function($value, $input) {
if ($input->getContextObject()->target === 'students') {
$filters = []; $filters = [];
foreach ($value as $one) { foreach ($value as $one) {
$filter = new UserFilter($one['id'] ?? ''); $filter = new UserFilter($one['id'] ?? '');
...@@ -71,6 +71,7 @@ class Massmail_MessageController extends \AuthenticatedController ...@@ -71,6 +71,7 @@ class Massmail_MessageController extends \AuthenticatedController
} }
$input->getContextObject()->filters = $filters; $input->getContextObject()->filters = $filters;
} }
}
], ],
'employee_filters' => [ 'employee_filters' => [
'type' => 'userFilter', 'type' => 'userFilter',
...@@ -78,8 +79,8 @@ class Massmail_MessageController extends \AuthenticatedController ...@@ -78,8 +79,8 @@ class Massmail_MessageController extends \AuthenticatedController
'if' => 'target === "employees"', 'if' => 'target === "employees"',
'context' => 'MassMail', 'context' => 'MassMail',
'target' => 'employees', 'target' => 'employees',
':key' => 'NaN',
'store' => function($value, $input) { 'store' => function($value, $input) {
if ($input->getContextObject()->target === 'employees') {
$filters = []; $filters = [];
foreach ($value as $one) { foreach ($value as $one) {
$filter = new UserFilter($one['id'] ?? ''); $filter = new UserFilter($one['id'] ?? '');
...@@ -101,6 +102,7 @@ class Massmail_MessageController extends \AuthenticatedController ...@@ -101,6 +102,7 @@ class Massmail_MessageController extends \AuthenticatedController
} }
$input->getContextObject()->filters = $filters; $input->getContextObject()->filters = $filters;
} }
}
], ],
'semester' => [ 'semester' => [
'type' => 'select', 'type' => 'select',
......
...@@ -126,6 +126,11 @@ export default { ...@@ -126,6 +126,11 @@ export default {
this.$emit('input', this.stringified); this.$emit('input', this.stringified);
} }
}, },
watch: {
target() {
this.filters = [];
}
},
mounted() { mounted() {
if (this.value) { if (this.value) {
this.filters = JSON.parse(this.value); this.filters = JSON.parse(this.value);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment