From dc5087c80800e641e939f657808a5bd3dd17d5fc Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Thu, 4 Apr 2024 11:06:11 +0000 Subject: fixes #3890 Closes #3890 Merge request studip/studip!2741 --- app/controllers/contact.php | 14 ++++++- app/views/calendar/calendar/export.php | 2 +- app/views/course/wizard/steps/lvgroups/index.php | 46 +++++++++++++--------- lib/classes/MyRealmModel.php | 4 +- .../coursewizardsteps/BasicDataWizardStep.php | 4 +- .../coursewizardsteps/LVGroupsWizardStep.php | 25 ++++++------ .../coursewizardsteps/StudyAreasWizardStep.php | 2 +- lib/plugins/core/CorePlugin.php | 2 +- 8 files changed, 62 insertions(+), 37 deletions(-) diff --git a/app/controllers/contact.php b/app/controllers/contact.php index 7dd2b05..2148777 100644 --- a/app/controllers/contact.php +++ b/app/controllers/contact.php @@ -189,9 +189,21 @@ class ContactController extends AuthenticatedController $user = User::findManyByUsername(Request::getArray('user')); } if ($group) { - $user = User::findMany(Statusgruppen::find($group)->members->pluck('user_id')); + $group_object = Statusgruppen::find($group); + if (!$group_object) { + $this->set_status(404); + $this->render_nothing(); + return; + } + $user = User::findMany($group_object->members->pluck('user_id')); } if (!$user) { + $user_object = User::findCurrent(); + if (!$user_object) { + $this->set_status(404); + $this->render_nothing(); + return; + } $user = User::findCurrent()->contacts; } diff --git a/app/views/calendar/calendar/export.php b/app/views/calendar/calendar/export.php index 3fa302e..0ff766d 100644 --- a/app/views/calendar/calendar/export.php +++ b/app/views/calendar/calendar/export.php @@ -8,7 +8,7 @@ */ ?>
+ action="link_for('calendar/calendar/export', $user_id ?? null) ?>">
diff --git a/app/views/course/wizard/steps/lvgroups/index.php b/app/views/course/wizard/steps/lvgroups/index.php index 744cc94..0d8e196 100644 --- a/app/views/course/wizard/steps/lvgroups/index.php +++ b/app/views/course/wizard/steps/lvgroups/index.php @@ -17,25 +17,33 @@ - + -
- - - -
+
+ + + +

+ value=""> - asInput(["name" => 'start_search', "onclick" => "return STUDIP.MVV.CourseWizard.searchTree()", "class" => $search_result?'hidden-no-js':'']) ?> + asInput([ + 'name' => 'start_search', + 'onclick' => 'return STUDIP.MVV.CourseWizard.searchTree()', + 'class' => !empty($search_result) ? 'hidden-no-js' : '', + ]) ?> - asInput(["name" => 'reset_search', "onclick" => "return STUDIP.MVV.CourseWizard.resetSearch()", "class" => $search_result?'':' hidden-no-js']) ?> + asInput([ + 'name' => 'reset_search', + 'onclick' => 'return STUDIP.MVV.CourseWizard.resetSearch()', + 'class' => !empty($search_result) ? '' : ' hidden-no-js', + ]) ?>
@@ -56,23 +64,25 @@ getChildren() ?> - - render_partial('lvgroups/_node', - ['node' => $node, 'pos_id' => $pos_id++, - 'open_nodes' => $open_lvg_nodes ?: [], - 'search_result' => $search_result ?: [], - 'children' => $node->getChildren()]) ?> + 0) : ?> + render_partial('lvgroups/_node', [ + 'node' => $node, + 'pos_id' => $pos_id++, + 'open_nodes' => $open_lvg_nodes ?: [], + 'search_result' => $search_result ?? [], + 'children' => $node->getChildren(), + ]) ?>
- + - - + +