Merge remote-tracking branch 'origin/develop'

snipe · Jan 8, 2024 · 8001ed8 · 8001ed8
2 parents d71a04e + eaf6d56
commit 8001ed8
Show file tree

Hide file tree

Showing 6 changed files with 945 additions and 64 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1,11 +1,14 @@
 {
   "projectName": "snipe-it",
   "projectOwner": "snipe",
+  "repoType": "github",
+  "repoHost": "https://github.com",
   "files": [
-    "README.md"
+    "CONTRIBUTORS.md"
   ],
   "imageSize": 110,
   "commit": true,
+  "commitConvention": "angular",
   "contributors": [
     {
       "login": "snipe",
@@ -3008,4 +3011,4 @@
       ]
     }
   ]
-}
+}
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
diff --git a/README.md b/README.md
diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php
@@ -72,6 +72,7 @@ class AssetMaintenance extends Model implements ICompanyableChild
     protected $searchableRelations = [
         'asset'     => ['name', 'asset_tag'],
         'asset.model'     => ['name', 'model_number'],
+        'asset.supplier' => ['name'],
     ];
 
     public function getCompanyableParents()