From 808c41acd66dcad905857defe0f024ed0522ff74 Mon Sep 17 00:00:00 2001 From: Tobias Kolzer Date: Wed, 31 Jan 2024 18:05:04 +0100 Subject: [PATCH] disabled users, items, tags for non admin users and user and login forms for all users --- lang/de/app.php | 2 ++ lang/en/app.php | 2 ++ resources/views/auth/login.blade.php | 11 +++++++++++ resources/views/items/form.blade.php | 8 ++++++++ resources/views/items/import.blade.php | 8 ++++++++ resources/views/items/list.blade.php | 8 ++++++++ resources/views/layouts/app.blade.php | 2 +- resources/views/settings/form.blade.php | 10 +++++++++- resources/views/settings/list.blade.php | 10 ++++++++++ resources/views/tags/form.blade.php | 11 ++++++++--- resources/views/tags/list.blade.php | 10 ++++++++-- resources/views/users/form.blade.php | 11 ++++++++--- resources/views/users/index.blade.php | 10 ++++++++-- resources/views/userselect.blade.php | 11 ++++++++++- 14 files changed, 101 insertions(+), 13 deletions(-) diff --git a/lang/de/app.php b/lang/de/app.php index 6574c2fc..62795aff 100644 --- a/lang/de/app.php +++ b/lang/de/app.php @@ -106,4 +106,6 @@ return array ( 'dashboard.reorder' => 'Elemente neu anordnen und anheften', 'dashboard.settings' => 'Einstellungen', 'role' => 'Authentifizierungsrolle', + 'unauthorized_for_form' => 'Sie haben keinen Zugriff auf diese Seite.', + 'diabled_feature' => 'Diese Funktion ist deaktiviert.', ); \ No newline at end of file diff --git a/lang/en/app.php b/lang/en/app.php index 130c2307..2941edb8 100644 --- a/lang/en/app.php +++ b/lang/en/app.php @@ -115,4 +115,6 @@ return array ( 'dashboard.reorder' => 'Reorder and pin items', 'dashboard.settings' => 'Settings', 'role' => 'Authentification role', + 'unauthorized_for_form' => 'You are not authorised to view this form.', + 'diabled_feature' => 'This feature is disabled.', ); \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index b6a4d065..7247d4ce 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,6 +1,8 @@ @extends('layouts.app') + @section('content') +@if(!$app['config']->get('app.auth_roles_enable', false)) @@ -21,5 +23,14 @@ $user = \App\User::currentUser(); +@else +
+
+
+ {{ __('app.diabled_feature') }} +
+
+
+@endif @endsection diff --git a/resources/views/items/form.blade.php b/resources/views/items/form.blade.php index b7de5b3a..d39687ab 100644 --- a/resources/views/items/form.blade.php +++ b/resources/views/items/form.blade.php @@ -1,4 +1,5 @@
+ @if($enable_auth_admin_controles)
{{ __('app.apps.preview') }}
@@ -144,6 +145,13 @@ {{ __('app.buttons.cancel') }}
+ @else +
+
+ {{ __('app.unauthorized_for_form') }} +
+
+ @endif
diff --git a/resources/views/items/import.blade.php b/resources/views/items/import.blade.php index 5e30d2c8..cda7c7b2 100644 --- a/resources/views/items/import.blade.php +++ b/resources/views/items/import.blade.php @@ -3,6 +3,7 @@ @section('content')
+ @if($enable_auth_admin_controles)
{{ __('app.import') }}
@@ -31,6 +32,13 @@ {{ __('app.buttons.cancel') }}
+ @else +
+
+ {{ __('app.unauthorized_for_form') }} +
+
+ @endif
diff --git a/resources/views/items/list.blade.php b/resources/views/items/list.blade.php index db7a11a8..b38ca421 100644 --- a/resources/views/items/list.blade.php +++ b/resources/views/items/list.blade.php @@ -2,6 +2,7 @@ @section('content')
+ @if($enable_auth_admin_controles)
{{ __('app.apps.app_list') }} @@ -53,6 +54,13 @@ + @else +
+
+ {{ __('app.unauthorized_for_form') }} +
+
+ @endif
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 6f9dd24e..be67e0a5 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -102,7 +102,7 @@ @endif
{{ __('app.dashboard') }}
- @if($current_user->id === 1) + @if($current_user->id === 1 && !config('app.auth_roles_enable'))
{{ __('app.user.user_list') }}
@endif
{{ __('app.apps.app_list') }}
diff --git a/resources/views/settings/form.blade.php b/resources/views/settings/form.blade.php index 1ffacce1..c9c3029e 100644 --- a/resources/views/settings/form.blade.php +++ b/resources/views/settings/form.blade.php @@ -1,4 +1,5 @@
+@if($enable_auth_admin_controles)
{{ __($setting->label) }}
@@ -26,5 +27,12 @@ {{ __('app.buttons.cancel') }}
+ @else +
+
+ {{ __('app.unauthorized_for_form') }} +
+
+ @endif -
+ diff --git a/resources/views/settings/list.blade.php b/resources/views/settings/list.blade.php index 923b65a5..a7212edf 100644 --- a/resources/views/settings/list.blade.php +++ b/resources/views/settings/list.blade.php @@ -2,6 +2,7 @@ @section('content') + @if($enable_auth_admin_controles) @foreach ($groups as $index => $group)
@@ -57,5 +58,14 @@
@endforeach + @else +
+
+
+ {{ __('app.unauthorized_for_form') }} +
+
+
+ @endif @endsection diff --git a/resources/views/tags/form.blade.php b/resources/views/tags/form.blade.php index 40e0761f..2da7b707 100644 --- a/resources/views/tags/form.blade.php +++ b/resources/views/tags/form.blade.php @@ -1,4 +1,5 @@
+ @if($enable_auth_admin_controles)
{{ __('app.apps.add_tag') }}
@@ -82,7 +83,11 @@ {{ __('app.buttons.cancel') }}
- + @else +
+
+ {{ __('app.unauthorized_for_form') }} +
+
+ @endif
- - diff --git a/resources/views/tags/list.blade.php b/resources/views/tags/list.blade.php index 7b1c8e1f..58f5a3f3 100644 --- a/resources/views/tags/list.blade.php +++ b/resources/views/tags/list.blade.php @@ -2,6 +2,7 @@ @section('content')
+ @if($enable_auth_admin_controles)
{{ __('app.apps.tag_list') }} @@ -50,7 +51,12 @@ + @else +
+
+ {{ __('app.unauthorized_for_form') }} +
+
+ @endif
- - @endsection diff --git a/resources/views/users/form.blade.php b/resources/views/users/form.blade.php index 45f3f866..31a8e3cc 100644 --- a/resources/views/users/form.blade.php +++ b/resources/views/users/form.blade.php @@ -1,4 +1,5 @@
+ @if($enable_auth_admin_controles)
{{ __('app.user.add_user') }}
@@ -91,7 +92,11 @@ {{ __('app.buttons.cancel') }}
- + @else +
+
+ {{ __('app.unauthorized_for_form') }} +
+
+ @endif
- - diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index ce4887f2..1d485f5b 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -2,6 +2,7 @@ @section('content')
+ @if($enable_auth_admin_controles)
{{ __('app.user.user_list') }} @@ -60,7 +61,12 @@ + @else +
+
+ {{ __('app.unauthorized_for_form') }} +
+
+ @endif
- - @endsection \ No newline at end of file diff --git a/resources/views/userselect.blade.php b/resources/views/userselect.blade.php index 97f67db8..abcd673d 100644 --- a/resources/views/userselect.blade.php +++ b/resources/views/userselect.blade.php @@ -1,7 +1,7 @@ @extends('layouts.users') @section('content') - +@if(!$app['config']->get('app.auth_roles_enable', false))
@foreach($users as $user) @@ -14,5 +14,14 @@ @endforeach
+@else +
+
+
+ {{ __('app.diabled_feature') }} +
+
+
+@endif @endsection \ No newline at end of file