From dda94c1b7c34a4309c510fe3639267ef1a35d0ff Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Thu, 29 Aug 2019 11:09:48 -0400 Subject: [PATCH] Fix Bug#100 --- app/Item.php | 12 ++++++++++++ resources/views/admin/inventory/index.blade.php | 2 +- resources/views/layouts/admin/sidebar.blade.php | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/Item.php b/app/Item.php index 00041aa0..e1ed7d79 100644 --- a/app/Item.php +++ b/app/Item.php @@ -3,6 +3,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use mysql_xdevapi\Collection; class Item extends Model { @@ -29,6 +30,17 @@ class Item extends Model public function category() { + if (\App\ItemCategory::find($this->category_id) == null) + { + $this->category_id = -1; + $this->save(); + $c = new \App\ItemCategory(); + $c->name = "[Categorie Supprimé]"; + $c->is_training = 0; + $c->is_op_appro = 0; + + return $c; + } return \App\ItemCategory::find($this->category_id); } diff --git a/resources/views/admin/inventory/index.blade.php b/resources/views/admin/inventory/index.blade.php index b89ec947..94f79d82 100644 --- a/resources/views/admin/inventory/index.blade.php +++ b/resources/views/admin/inventory/index.blade.php @@ -10,7 +10,7 @@

diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index 906773aa..69ffdb57 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -106,7 +106,7 @@

-
+