From 49bd38db50387834102740ddfec0cc0506ad2312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Thu, 24 Aug 2017 02:04:20 +0200 Subject: [PATCH] FEATURE: hopefully last changes about permissions --- app/Policies/TemplatePolicy.php | 2 +- .../admin/templates/templatesTiles.blade.php | 7 +------ .../admin/userManagement/detail.blade.php | 21 +++++++++---------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/app/Policies/TemplatePolicy.php b/app/Policies/TemplatePolicy.php index bd1c5888..0be12e49 100644 --- a/app/Policies/TemplatePolicy.php +++ b/app/Policies/TemplatePolicy.php @@ -20,7 +20,7 @@ class TemplatePolicy extends BasicPolicy * * @return mixed */ - public function copy(User $user, Template $template) + public function copy(User $user) { return $user->hasAbility('copy-templates'); } diff --git a/resources/views/admin/templates/templatesTiles.blade.php b/resources/views/admin/templates/templatesTiles.blade.php index 74e3654a..8f0bf1bf 100644 --- a/resources/views/admin/templates/templatesTiles.blade.php +++ b/resources/views/admin/templates/templatesTiles.blade.php @@ -8,7 +8,7 @@ {{str_limit($template->description, 150)}} - @can('copy', $template) + @can('copy', \App\Models\Templates\Template::class) @if($isWritable) @endif - @else - - - @endcan @can('update', $template) - - + + + @endcan @endsection @@ -112,13 +112,12 @@ @endforeach - -
- @lang('admin/userManagement.moreUserActions') -
- - + @can('manage', \App\Models\ActionLog\ActionLog::class) +
+ @lang('admin/userManagement.moreUserActions') +
+ @endcan @else
@lang('admin/userManagement.noActions')