Skip to content
Snippets Groups Projects
Commit 8e3b1846 authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

fix SORM usage in https://develop.studip.de/trac/changeset/60202, fixes #346

parent 35d3cb29
No related branches found
No related tags found
No related merge requests found
......@@ -621,7 +621,7 @@ class Course_BasicdataController extends AuthenticatedController
if ($deputies_enabled) {
// Check whether chosen person is set as deputy
// -> delete deputy entry.
$deputy = Deputy::find([$dozent, $course_id]);
$deputy = Deputy::find([$course_id, $dozent]);
if ($deputy) {
$deputy->delete();
}
......@@ -702,12 +702,12 @@ class Course_BasicdataController extends AuthenticatedController
PageLayout::postError(_('Sie dürfen sich nicht selbst aus der Veranstaltung austragen.'));
} else {
$sem = Seminar::getInstance($course_id);
$deputy = Deputy::find([$deputy_id, $course_id]);
$deputy = Deputy::find([$course_id, $deputy_id]);
if ($deputy && $deputy->delete()) {
// Remove user from subcourses as well.
if($sem->children) {
if (count($sem->children)) {
$children_ids = $sem->children->pluck('seminar_id');
Deputy::deleteBySQL('user_id = ? AND range_id IN (?)', [$children_ids]);
Deputy::deleteBySQL('user_id = ? AND range_id IN (?)', [$deputy_id, $children_ids]);
}
PageLayout::postSuccess(sprintf(
......@@ -850,7 +850,7 @@ class Course_BasicdataController extends AuthenticatedController
$dozent->status = 'dozent';
$dozent->comment = '';
if ($dozent->store()) {
$deputy = Deputy::find([$GLOBALS['user']->id, $course_id]);
$deputy = Deputy::find([$course_id, $GLOBALS['user']->id]);
if ($deputy) {
$deputy->delete();
}
......
......@@ -379,7 +379,7 @@ class Course_MembersController extends AuthenticatedController
if (Config::get()->DEPUTIES_ENABLE) {
// Check whether chosen person is set as deputy
// -> delete deputy entry.
$deputy = Deputy::find([$dozent, $this->course_id]);
$deputy = Deputy::find([$this->course_id, $dozent]);
if ($deputy) {
$deputy->delete();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment