From 47f6635992e589b90fee7dfb8bc9fca4387354d8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 28 Jul 2016 21:31:53 -0700
Subject: [PATCH] A few more permissions tweaks

---
 app/Providers/AuthServiceProvider.php         |  6 ++
 resources/views/account/view-assets.blade.php | 10 +--
 resources/views/licenses/view.blade.php       | 74 ++++++++++++-------
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 87f3f95812..189f57b331 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -268,6 +268,12 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        $gate->define('licenses.keys', function ($user) {
+            if (($user->hasAccess('licenses.keys')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
 
     }
 }
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index 7934c9276c..f294de0961 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -102,12 +102,12 @@ View Assets for  {{ $user->fullName() }}
                       <td>{{ $license->name }}</td>
                       <td>
 
-                         @if (($user->hasAccess('admin')) || ($user->hasAccess('license_keys')))
+                          @can('licenses.keys')
 
-                         {{ mb_strimwidth($license->serial, 0, 50, "...") }}
-                        @else
-                          ---
-                        @endif
+                             {{ mb_strimwidth($license->serial, 0, 50, "...") }}
+                            @else
+                              ---
+                            @endcan
                       </td>
                   </tr>
                   @endforeach
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 2158409fc8..a81f87694d 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -10,6 +10,7 @@
 {{-- Right header --}}
 @section('header_right')
 <div class="btn-group pull-right">
+    @can('licenses.edit')
       <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
           <span class="caret"></span>
       </button>
@@ -17,6 +18,7 @@
           <li><a href="{{ route('update/license', $license->id) }}">{{ trans('admin/licenses/general.edit') }}</a></li>
           <li><a href="{{ route('clone/license', $license->id) }}">{{ trans('admin/licenses/general.clone') }}</a></li>
       </ul>
+     @endcan
   </div>
 @stop
 
@@ -60,39 +62,57 @@
                             <td>Seat {{ $count }} </td>
                             <td>
                                 @if (($licensedto->assigned_to) && ($licensedto->deleted_at == NULL))
-                                    <a href="{{ route('view/user', $licensedto->assigned_to) }}">
-                                {{ $licensedto->user->fullName() }}
-                                </a>
+                                    @can('users.view')
+                                        <a href="{{ route('view/user', $licensedto->assigned_to) }}">
+                                            {{ $licensedto->user->fullName() }}
+                                        </a>
+                                     @else
+                                        {{ $licensedto->user->fullName() }}
+                                     @endcan
+
                                 @elseif (($licensedto->assigned_to) && ($licensedto->deleted_at != NULL))
                                     <del>{{ $licensedto->user->fullName() }}</del>
                                 @elseif ($licensedto->asset_id)
                                     @if ($licensedto->asset->assigned_to != 0)
-                                        <a href="{{ route('view/user', $licensedto->asset->assigned_to) }}">
+                                        @can('users.view')
+                                            <a href="{{ route('view/user', $licensedto->asset->assigned_to) }}">
+                                                {{ $licensedto->asset->assigneduser->fullName() }}
+                                            </a>
+                                        @else
                                             {{ $licensedto->asset->assigneduser->fullName() }}
-                                        </a>
+                                        @endcan
+
                                     @endif
                                 @endif
                             </td>
                             <td>
                                 @if ($licensedto->asset_id)
-                                    <a href="{{ route('view/hardware', $licensedto->asset_id) }}">
-                                    {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }}
-                                </a>
+                                        @can('assets.view')
+                                            <a href="{{ route('view/hardware', $licensedto->asset_id) }}">
+                                                {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }}
+                                            </a>
+                                        @else
+                                            {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }}
+                                        @endcan
+
                                 @endif
                             </td>
                             <td>
-                                @if (($licensedto->assigned_to) || ($licensedto->asset_id))
-                                    @if ($license->reassignable)
-                                        <a href="{{ route('checkin/license', $licensedto->id) }}" class="btn btn-primary btn-sm">
-                                        {{ trans('general.checkin') }}
-                                        </a>
-                                    @else
-                                        <span>Assigned</span>
-                                    @endif
-                                @else
-                                    <a href="{{ route('checkout/license', $licensedto->id) }}" class="btn btn-info btn-sm">
-                                    {{ trans('general.checkout') }}</a>
-                                @endif
+                                @can('licenses.checkout')
+                                        @if (($licensedto->assigned_to) || ($licensedto->asset_id))
+
+                                            @if ($license->reassignable)
+                                                <a href="{{ route('checkin/license', $licensedto->id) }}" class="btn btn-primary btn-sm">
+                                                {{ trans('general.checkin') }}
+                                                </a>
+                                            @else
+                                                <span>Assigned</span>
+                                            @endif
+                                        @else
+                                            <a href="{{ route('checkout/license', $licensedto->id) }}" class="btn btn-info btn-sm">
+                                            {{ trans('general.checkout') }}</a>
+                                        @endif
+                                @endcan
                             </td>
 
                         </tr>
@@ -116,12 +136,14 @@
                     </tr>
                     @endif
 
-                    @if (!is_null($license->serial))
-                    <tr>
-                      <td>{{ trans('admin/licenses/form.license_key') }}</td>
-                      <td style="word-wrap: break-word;overflow-wrap: break-word;word-break: break-word;">{!! nl2br(e($license->serial)) !!}</td>
-                    </tr>
-                    @endif
+                    @can('licenses.keys')
+                        @if (!is_null($license->serial))
+                        <tr>
+                          <td>{{ trans('admin/licenses/form.license_key') }}</td>
+                          <td style="word-wrap: break-word;overflow-wrap: break-word;word-break: break-word;">{!! nl2br(e($license->serial)) !!}</td>
+                        </tr>
+                        @endif
+                    @endcan
 
                     @if (!is_null($license->license_name))
                     <tr>