Applied master changes to develop

Wrong branch :(

app/Models/AssetMaintenance.php

@@ -154,12 +154,12 @@ class AssetMaintenance extends Model implements ICompanyableChild
 
          return $query->where(function ($query) use ($search) {
 
-                $query->where('title', 'LIKE', '%'.$search.'%')
+                $query->where('asset_maintenances.title', 'LIKE', '%'.$search.'%')
-                ->orWhere('notes', 'LIKE', '%'.$search.'%')
+                ->orWhere('asset_maintenances.notes', 'LIKE', '%'.$search.'%')
-                ->orWhere('asset_maintenance_type', 'LIKE', '%'.$search.'%')
+                ->orWhere('asset_maintenances.asset_maintenance_type', 'LIKE', '%'.$search.'%')
-                ->orWhere('cost', 'LIKE', '%'.$search.'%')
+                ->orWhere('asset_maintenances.cost', 'LIKE', '%'.$search.'%')
-                ->orWhere('start_date', 'LIKE', '%'.$search.'%')
+                ->orWhere('asset_maintenances.start_date', 'LIKE', '%'.$search.'%')
-                ->orWhere('completion_date', 'LIKE', '%'.$search.'%');
+                ->orWhere('asset_maintenances.completion_date', 'LIKE', '%'.$search.'%');
          });
     }
 

app/Policies/AssetPolicy.php

@@ -16,4 +16,9 @@ class AssetPolicy extends CheckoutablePermissionsPolicy
     {
         return $user->hasAccess('assets.view.requestable');
     }
+
+    public function audit(User $user, Asset $asset = null)
+    {
+        return $user->hasAccess('assets.audit');
+    }
 }

resources/views/custom_fields/index.blade.php

@@ -98,7 +98,12 @@
             <tr>
               <td>{{ $field->name }}</td>
               <td>{{ $field->help_text }}</td>
-              <td>{{ $field->convertUnicodeDbSlug() }}</td>
+              <td>
+                 <code>{{ $field->convertUnicodeDbSlug() }}</code>
+                @if ($field->convertUnicodeDbSlug()!=$field->db_column)
+                  <br><i class="fa fa-warning text-danger"></i>WARNING. This field is in the custom fields table as <code>{{  $field->db_column }}</code> but should be <code>{{ $field->convertUnicodeDbSlug() }}</code>.
+                @endif
+              </td>
               <td>{{ $field->format }}</td>
               <td>{{ $field->element }}</td>
               <td>

resources/views/hardware/view.blade.php

@@ -16,14 +16,24 @@
   <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
     @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
       @if ($asset->assigned_to != '')
+        @can('checkin', \App\Models\Asset::class)
       <li role="presentation"><a href="{{ route('checkin/hardware', $asset->id) }}">{{ trans('admin/hardware/general.checkin') }}</a></li>
+          @endcan
       @else
+       @can('checkout', \App\Models\Asset::class)
       <li role="presentation"><a href="{{ route('checkout/hardware', $asset->id)  }}">{{ trans('admin/hardware/general.checkout') }}</a></li>
+          @endcan
       @endif
     @endif
+      @can('edit', \App\Models\Asset::class)
     <li role="presentation"><a href="{{ route('hardware.edit', $asset->id) }}">{{ trans('admin/hardware/general.edit') }}</a></li>
+      @endcan
+      @can('create', \App\Models\Asset::class)
     <li role="presentation"><a href="{{ route('clone/hardware', $asset->id) }}">{{ trans('admin/hardware/general.clone') }}</a></li>
+      @endcan
+      @can('audit', \App\Models\Asset::class)
       <li role="presentation"><a href="{{ route('asset.audit.create', $asset->id)  }}">{{ trans('general.audit') }}</a></li>
+     @endcan
   </ul>
 </div>
 @endcan