From ff705821cf7c5c2a8e48eefcb080a120c6a6c120 Mon Sep 17 00:00:00 2001 From: Valkje Date: Fri, 12 Mar 2021 14:02:12 +0100 Subject: [PATCH 1/3] Remove KEI-week route --- app/Http/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index b4ca1458..960b3a91 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -10,7 +10,7 @@ // Route::get('kiezel', 'HomeController@showKiezel'); // Kei 2020 -Route::get('kei', 'HomeController@showKei'); +// Route::get('kei', 'HomeController@showKei'); // Privacy-related stuff Route::get('privacy-statement', 'PublicFilesController@showPrivacyStatement'); From dda49a61a35ff3a8010f14d4084b603705ad641e Mon Sep 17 00:00:00 2001 From: Valkje Date: Fri, 12 Mar 2021 14:08:30 +0100 Subject: [PATCH 2/3] Move activities item back into menu --- GSVnet/Core/Composers/NavigationViewComposer.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/GSVnet/Core/Composers/NavigationViewComposer.php b/GSVnet/Core/Composers/NavigationViewComposer.php index 73896754..cb734635 100644 --- a/GSVnet/Core/Composers/NavigationViewComposer.php +++ b/GSVnet/Core/Composers/NavigationViewComposer.php @@ -270,6 +270,14 @@ private function getStructure() // ], + 'activiteiten' => [ + 'title' => 'Activiteiten', + 'url' => action('EventController@showIndex'), + 'visible' => function(){ + return Auth::check() && Gate::allows('events.show-private'); + } + ], + 'jaarbundel' => [ 'title' => 'Jaarbundel', 'url' => action('UserController@showUsers'), From c7532add9164ad2cd1e9967cdc48504f3184a6ae Mon Sep 17 00:00:00 2001 From: Valkje Date: Fri, 12 Mar 2021 14:17:50 +0100 Subject: [PATCH 3/3] Add admin submenu entry and admin.show permission --- GSVnet/Core/Composers/NavigationViewComposer.php | 7 +++++++ config/permissions.php | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/GSVnet/Core/Composers/NavigationViewComposer.php b/GSVnet/Core/Composers/NavigationViewComposer.php index cb734635..b57d256e 100644 --- a/GSVnet/Core/Composers/NavigationViewComposer.php +++ b/GSVnet/Core/Composers/NavigationViewComposer.php @@ -350,6 +350,13 @@ private function getStructure() return Gate::allows('docs.show'); } ], + 'admin' => [ + 'title' => 'Admin', + 'url' => action('Admin\AdminController@index'), + 'visible' => function(){ + return Gate::allows('admin.show'); + } + ], 'sponsorprogramma' => [ 'title' => 'Sponsors', 'url' => action('HomeController@sponsorProgram'), diff --git a/config/permissions.php b/config/permissions.php index c45afcba..e48320bd 100644 --- a/config/permissions.php +++ b/config/permissions.php @@ -89,6 +89,10 @@ 'senate' => true ], + 'admin.show' => [ + 'type' => [User::MEMBER, User::REUNIST] + ], + 'admin' => [ 'committee' => ['webcie'] ],