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

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

parent bb349cfd
No related branches found
No related tags found
No related merge requests found
...@@ -621,7 +621,7 @@ class Course_BasicdataController extends AuthenticatedController ...@@ -621,7 +621,7 @@ class Course_BasicdataController extends AuthenticatedController
if ($deputies_enabled) { if ($deputies_enabled) {
// Check whether chosen person is set as deputy // Check whether chosen person is set as deputy
// -> delete deputy entry. // -> delete deputy entry.
$deputy = Deputy::find([$dozent, $course_id]); $deputy = Deputy::find([$course_id, $dozent]);
if ($deputy) { if ($deputy) {
$deputy->delete(); $deputy->delete();
} }
...@@ -702,12 +702,12 @@ class Course_BasicdataController extends AuthenticatedController ...@@ -702,12 +702,12 @@ class Course_BasicdataController extends AuthenticatedController
PageLayout::postError(_('Sie dürfen sich nicht selbst aus der Veranstaltung austragen.')); PageLayout::postError(_('Sie dürfen sich nicht selbst aus der Veranstaltung austragen.'));
} else { } else {
$sem = Seminar::getInstance($course_id); $sem = Seminar::getInstance($course_id);
$deputy = Deputy::find([$deputy_id, $course_id]); $deputy = Deputy::find([$course_id, $deputy_id]);
if ($deputy && $deputy->delete()) { if ($deputy && $deputy->delete()) {
// Remove user from subcourses as well. // Remove user from subcourses as well.
if($sem->children) { if (count($sem->children)) {
$children_ids = $sem->children->pluck('seminar_id'); $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( PageLayout::postSuccess(sprintf(
...@@ -850,8 +850,8 @@ class Course_BasicdataController extends AuthenticatedController ...@@ -850,8 +850,8 @@ class Course_BasicdataController extends AuthenticatedController
$dozent->status = 'dozent'; $dozent->status = 'dozent';
$dozent->comment = ''; $dozent->comment = '';
if ($dozent->store()) { if ($dozent->store()) {
$deputy = Deputy::find([$GLOBALS['user']->id, $course_id]); $deputy = Deputy::find([$course_id, $GLOBALS['user']->id]);
if($deputy) { if ($deputy) {
$deputy->delete(); $deputy->delete();
} }
PageLayout::postSuccess(sprintf(_('Sie wurden als %s eingetragen.'), PageLayout::postSuccess(sprintf(_('Sie wurden als %s eingetragen.'),
......
...@@ -379,7 +379,7 @@ class Course_MembersController extends AuthenticatedController ...@@ -379,7 +379,7 @@ class Course_MembersController extends AuthenticatedController
if (Config::get()->DEPUTIES_ENABLE) { if (Config::get()->DEPUTIES_ENABLE) {
// Check whether chosen person is set as deputy // Check whether chosen person is set as deputy
// -> delete deputy entry. // -> delete deputy entry.
$deputy = Deputy::find([$dozent, $this->course_id]); $deputy = Deputy::find([$this->course_id, $dozent]);
if ($deputy) { if ($deputy) {
$deputy->delete(); $deputy->delete();
} }
......
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