From b3e360e0d2af8fe1cf38f3a9760ba699655963b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 27 Jul 2021 12:34:45 +0200 Subject: [PATCH 1/3] Log.update policy change is owend and role dev instead of or --- app/Policies/LogPolicy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Policies/LogPolicy.php b/app/Policies/LogPolicy.php index 1917b41..becb137 100644 --- a/app/Policies/LogPolicy.php +++ b/app/Policies/LogPolicy.php @@ -31,7 +31,7 @@ class LogPolicy extends RootPolicy 'log' => [ 'viewAny' => URR::make('userIsAdmin', $user), 'view' => URR::make('denyEveryOne'), - 'update' => StaticRules::or([ + 'update' => StaticRules::and([ URR::make('userIsDev', $user), LogStaticRules::make('logIsOwnedByUser', $user, $model) ]), From c7f47b57e221b1bafa929cd260f1e53cb0a39c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 27 Jul 2021 12:51:23 +0200 Subject: [PATCH 2/3] overload project show --- app/Http/Controllers/ProjectController.php | 8 ++++ resources/views/projects/show.blade.php | 53 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 resources/views/projects/show.blade.php diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 4feb02e..9966c8e 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -10,6 +10,7 @@ class ProjectController extends Controller { use CrudController { index as crudIndex; + show as crudShow; } /** @var Project */ @@ -26,4 +27,11 @@ class ProjectController extends Controller } return view('projects.index', $view->getData()); } + + public function show(Project $model) + { + /** @var \Illuminate\View\View */ + $view = $this->crudshow($model); + return view('projects.show', $view->getData()); + } } diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php new file mode 100644 index 0000000..fb01815 --- /dev/null +++ b/resources/views/projects/show.blade.php @@ -0,0 +1,53 @@ +@extends($viewLayout) + +@section('title', sprintf('%s - %s', transFb(sprintf('models.classes.%s', strtolower(Str::plural(class_basename($modelClass)))), Str::plural(class_basename($modelClass))), __('crud-policies::crud.view'))) +@section('description', sprintf('%s %s', __('crud-policies::crud.view'), trans(class_basename($modelClass)))) +@section('metaIndex', 'noindex,nofollow') + +@section('content') +
+ @include('crud-policies::crud.modules.flashMessage') +
+ @include('crud-policies::crud.modules.breadcrumb', ['action' => CrudAction::view()]) + @include('crud-policies::crud.modules.actionbar.bar', ['action' => CrudAction::view()]) +
+
+ + + + + + + + + @foreach ($modelClass::getEditableProperties() as $fieldName => $prop) + @if(in_array(CrudAction::view(), $prop['actions'])) + @switch($prop['type']) + @case(CrudType::password()) + {{-- Ignore --}} + @break + @default + + + @switch($fieldName) + @case('description') + @case('todo') + + @break + @default + + @endswitch + + @endswitch + @endif + @endforeach + +
{{ __('crud-policies::crud.property') }}{{ __('crud-policies::crud.value') }}
{{ $prop['label'] }}{!! $model->{$fieldName} !!}@include('crud-policies::crud.printfield', [ + 'action' => CrudAction::view(), + 'field' => $model->{$fieldName}, + 'props' => $prop + ])
+
+
+@include('crud-policies::crud.modules.scriptConstants') +@endsection From 74c30c8a7c8937e619f85a782a29c04ee9f94304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 27 Jul 2021 12:51:33 +0200 Subject: [PATCH 3/3] improve log index --- resources/views/logs/index.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/logs/index.blade.php b/resources/views/logs/index.blade.php index 0e98900..1bb533f 100644 --- a/resources/views/logs/index.blade.php +++ b/resources/views/logs/index.blade.php @@ -51,8 +51,11 @@
-
- {{ $model->created_at }} +
+ + {{ $model->created_at }} + +  {{ $model->user->name }} $ 
@can('view', $model) @@ -71,10 +74,7 @@
-
{{ __('Par :username', [ - 'username' => $model->user->name - ])}}
-
{{ $model->entry }}
+
{!! $model->entry !!}