Merge branch '3.2.1' into 'dev'

Fix Bug#100

See merge request TheGamecraft/c-cms!50

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);
     }
 

resources/views/admin/inventory/index.blade.php

@@ -10,7 +10,7 @@
         <div class="card-body">
             <div class="btn-group btn-block">
                 <a name="add" id="add" class="btn btn-primary btn-block" href="/admin/item/add" role="button">Ajouter un item</a>
-                <a name="add" id="add" class="btn btn-outline-primary btn-block" href="/admin/item/add" role="button">Réserver un item</a>
+                <a name="add" id="add" class="btn btn-outline-primary btn-block" href="/admin/booking/add" role="button">Réserver un item</a>
             </div>
             <hr>
             <table id="log-data" class="table table-striped table-bordered">

resources/views/layouts/admin/sidebar.blade.php

@@ -106,7 +106,7 @@
                   <b class="caret"></b>
               </p>
           </a>
-          <div class="collapse" id="inventory">
+          <div class="collapse" id="picture">
               <ul class="nav">
                   <li class="nav-item ">
                       <a class="nav-link" href="/admin/picture">