diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 226e3650b..f1e817ca1 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -114,6 +114,24 @@ class AuthServiceProvider extends ServiceProvider } }); + Gate::define('accessories.files', function ($user) { + if ($user->hasAccess('accessories.files')) { + return true; + } + }); + + Gate::define('components.files', function ($user) { + if ($user->hasAccess('components.files')) { + return true; + } + }); + + Gate::define('consumables.files', function ($user) { + if ($user->hasAccess('consumables.files')) { + return true; + } + }); + // Can the user import CSVs? Gate::define('import', function ($user) { if ($user->hasAccess('import')) { diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 2bccb40a9..82d7c8201 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -84,8 +84,7 @@ @endcan - @can('update', Component::class) - + @can('update', $accessory)
  • {{ trans('button.upload') }} @@ -99,7 +98,7 @@
    -
    +
    -
    +
    +
    +
    @endcan
    - - @@ -345,9 +344,6 @@ @endcan - - -
    @@ -387,8 +383,8 @@
    - - + + diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php index 2f6a30208..70bd87948 100644 --- a/resources/views/components/view.blade.php +++ b/resources/views/components/view.blade.php @@ -80,8 +80,7 @@
  • @endcan - @can('update', Component::class) - + @can('components.files', $component)
  • {{ trans('button.upload') }} diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index 90d27cff1..6bb3dc26b 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -45,8 +45,7 @@
  • @endcan - @can('update', Consumable::class) - + @can('update', $consumable)
  • {{ trans('button.upload') }} @@ -200,7 +199,7 @@
    - + @if ($consumable->image!='')
    @@ -260,7 +259,7 @@ {{ trans('general.checkout') }} @else - @endif @@ -269,7 +268,7 @@ @endcan @if ($consumable->notes) - +
    {{ trans('general.notes') }}: @@ -282,7 +281,7 @@ @endif
    - +