From c806c340630000f8682b9aaa203b96767772d662 Mon Sep 17 00:00:00 2001 From: David Siegfried Date: Mon, 9 Aug 2021 12:01:40 +0200 Subject: hide booking-plan-icon if the user has no rights --- app/views/resources/_common/_room_search_result.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/views/resources/_common/_room_search_result.php b/app/views/resources/_common/_room_search_result.php index 1da06b0..b32a23d 100644 --- a/app/views/resources/_common/_room_search_result.php +++ b/app/views/resources/_common/_room_search_result.php @@ -17,7 +17,7 @@ Icon::create('info-circle'), ['data-dialog' => ''] ); - if ($room->userHasPermission($current_user, 'autor')) { + if ($room->userHasPermission($current_user, 'autor') || $room->booking_plan_is_public) { $actions->addLink( $room->getActionLink('booking_plan'), _('Wochenbelegung'), @@ -30,19 +30,12 @@ Icon::create('timetable'), ['target' => '_blank'] ); - } else { $actions->addLink( $room->getActionLink('booking_plan'), _('Belegungsplan'), Icon::create('timetable'), ['data-dialog' => 'size=big'] ); - $actions->addLink( - $room->getActionLink('semester_plan'), - _('Semesterbelegung'), - Icon::create('timetable'), - ['data-dialog' => 'size=big'] - ); } if ($room->requestable && $room->userHasRequestRights($current_user)) { $actions->addLink( -- cgit v1.0 From ac0e9904cca43e8685f6e37f0df7a85e3b5f76e1 Mon Sep 17 00:00:00 2001 From: David Siegfried Date: Mon, 9 Aug 2021 12:06:47 +0200 Subject: refine --- .../resources/_common/_room_search_result.php | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/views/resources/_common/_room_search_result.php b/app/views/resources/_common/_room_search_result.php index b32a23d..c8eae82 100644 --- a/app/views/resources/_common/_room_search_result.php +++ b/app/views/resources/_common/_room_search_result.php @@ -17,7 +17,7 @@ Icon::create('info-circle'), ['data-dialog' => ''] ); - if ($room->userHasPermission($current_user, 'autor') || $room->booking_plan_is_public) { + if ($room->userHasPermission($current_user, 'autor')) { $actions->addLink( $room->getActionLink('booking_plan'), _('Wochenbelegung'), @@ -30,12 +30,21 @@ Icon::create('timetable'), ['target' => '_blank'] ); - $actions->addLink( - $room->getActionLink('booking_plan'), - _('Belegungsplan'), - Icon::create('timetable'), - ['data-dialog' => 'size=big'] - ); + } else { + if ($room->booking_plan_is_public) { + $actions->addLink( + $room->getActionLink('booking_plan'), + _('Belegungsplan'), + Icon::create('timetable'), + ['data-dialog' => 'size=big'] + ); + $actions->addLink( + $room->getActionLink('semester_plan'), + _('Semesterbelegung'), + Icon::create('timetable'), + ['data-dialog' => 'size=big'] + ); + } } if ($room->requestable && $room->userHasRequestRights($current_user)) { $actions->addLink( -- cgit v1.0 From 2900f24d4083c714eaefd2894d98722ed37dd895 Mon Sep 17 00:00:00 2001 From: David Siegfried Date: Mon, 9 Aug 2021 12:13:33 +0200 Subject: add another check --- app/views/resources/_common/_room_search_result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/resources/_common/_room_search_result.php b/app/views/resources/_common/_room_search_result.php index c8eae82..b6ecc89 100644 --- a/app/views/resources/_common/_room_search_result.php +++ b/app/views/resources/_common/_room_search_result.php @@ -31,7 +31,7 @@ ['target' => '_blank'] ); } else { - if ($room->booking_plan_is_public) { + if ($room->booking_plan_is_public && Config::get()->RESOURCES_SHOW_PUBLIC_ROOM_PLANS) { $actions->addLink( $room->getActionLink('booking_plan'), _('Belegungsplan'), -- cgit v1.0