From f43692938b2995bda1faf437d66953d3f90a5433 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Nov 2017 08:02:51 -0700
Subject: [PATCH 1/3] Fixed slug call in asset models image

---
 app/Http/Controllers/AssetModelsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index cad33d779..adc023656 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -90,7 +90,7 @@ class AssetModelsController extends Controller
         if (Input::file('image')) {
 
             $image = Input::file('image');
-            $file_name = slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
+            $file_name = str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
             $path = public_path('uploads/models/');
 
             if ($image->getClientOriginalExtension()!='svg') {

From 3695e118f416c66e3d7dda9c1cbb76118994c08d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Nov 2017 08:06:10 -0700
Subject: [PATCH 2/3] Fixed erroneous call to assets.category in filter scope

---
 app/Models/Asset.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 38bc1f394..eefc8b88a 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -872,7 +872,7 @@ class Asset extends Depreciable
                 }
 
                 if ($fieldname =='location') {
-                    $query->whereHas('defaultLoc', function ($query) use ($search_val) {
+                    $query->whereHas('location', function ($query) use ($search_val) {
                         $query->where('locations.name', 'LIKE', '%' . $search_val . '%');
                     });
                 }
@@ -935,8 +935,11 @@ class Asset extends Depreciable
                 }
             }
 
+            if ($fieldname!='category') {
+                $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
+            }
+
 
-            $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
 
 
         });

From fd74e4308b1324bfc7bbece9e7c3570999dd5bfe Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Nov 2017 08:11:04 -0700
Subject: [PATCH 3/3] =?UTF-8?q?Don=E2=80=99t=20show=20request=20if=20the?=
 =?UTF-8?q?=20user=20or=20the=20asset/model=20has=20been=20deleted?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/hardware/requested.blade.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index 2b3ccab86..94a99ac1e 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -48,12 +48,14 @@
                 </thead>
                 <tbody>
                     @foreach ($requestedItems as $request)
+
+                        @if ($request->requestable)
                     <tr>
                             {{ csrf_field() }}
                             <td>
-                                @if ($request->itemType() == "asset")
+                                @if (($request->itemType() == "asset") && ($request->requestable))
                                     <a href="{{ $request->requestable->getImageUrl() }}" data-toggle="lightbox" data-type="image"><img src="{{ $request->requestable->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>
-                                @else
+                                @elseif (($request->itemType() == "asset_model") && ($request->requestable))
                                         <a href="{{ url('/') }}/uploads/models/{{ $request->requestable->image }}" data-toggle="lightbox" data-type="image"><img src="{{ url('/') }}/uploads/models/{{ $request->requestable->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>
                                 @endif
 
@@ -102,6 +104,7 @@
 
 
                     </tr>
+                    @endif
                     @endforeach
                 </tbody>
             </table>