Merge pull request #97 from devaslanphp/dev

Bug-fix: remove has_all_permissions helper
devaslanphp · Sep 26, 2022 · e46d7d5 · e46d7d5
2 parents 9f77fa2 + 5b2e904
commit e46d7d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resources/views/livewire/ticket-details/responsible.blade.php b/resources/views/livewire/ticket-details/responsible.blade.php
@@ -27,7 +27,7 @@
             @else
                 <span class="text-gray-400 font-medium text-sm">@lang('Not assigned yet!')</span>
             @endif
-            @if((auth()->user()->can('update all tickets') || (auth()->user()->can('Update own tickets') && ($ticket->owner_id === auth()->user() || $ticket->responsible_id === auth()->user()->id))) && has_all_permissions(auth()->user(), 'assign-tickets'))
+            @if((auth()->user()->can('update all tickets') || (auth()->user()->can('Update own tickets') && ($ticket->owner_id === auth()->user() || $ticket->responsible_id === auth()->user()->id))) && auth()->user()->can('assign-tickets'))
                 <button type="button" wire:click="update" class="bg-gray-100 shadow hover:bg-gray-200 hover:shadow-lg w-6 h-6 text-xs flex-row justify-center items-center rounded-lg text-gray-400">
                     <i class="fa fa-pencil"></i>
                 </button>

diff --git a/resources/views/livewire/ticket-details/status.blade.php b/resources/views/livewire/ticket-details/status.blade.php
@@ -18,7 +18,7 @@
     @else
         <div class="w-full flex flex-row justify-start items-center gap-5 updating-section">
             <x-status-span :status="$ticket->status" />
-            @if((auth()->user()->can('update all tickets') || (auth()->user()->can('Update own tickets') && ($ticket->owner_id === auth()->user() || $ticket->responsible_id === auth()->user()->id))) && has_all_permissions(auth()->user(), 'change-status-tickets'))
+            @if((auth()->user()->can('update all tickets') || (auth()->user()->can('Update own tickets') && ($ticket->owner_id === auth()->user() || $ticket->responsible_id === auth()->user()->id))) && auth()->user()->can('change-status-tickets'))
                 <button type="button" wire:click="update" class="bg-gray-100 shadow hover:bg-gray-200 hover:shadow-lg w-6 h-6 text-xs flex-row justify-center items-center rounded-lg text-gray-400">
                     <i class="fa fa-pencil"></i>
                 </button>