Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Author: snipe

app/Models/Accessory.php

@@ -4,6 +4,7 @@
 
 use App\Helpers\Helper;
 use App\Models\Traits\Acceptable;
+use App\Models\Traits\HasUploads;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -22,6 +23,7 @@ class Accessory extends SnipeModel
 
     protected $presenter = \App\Presenters\AccessoryPresenter::class;
     use CompanyableTrait;
+    use HasUploads;
     use Loggable, Presentable;
     use SoftDeletes;
 
@@ -102,24 +104,6 @@ class Accessory extends SnipeModel
     ];
 
 
-
-    /**
-     * Establishes the accessories -> action logs -> uploads relationship
-     *
-     * @author A. Gianotto <[email protected]>
-     * @since [v6.1.13]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
-            ->where('item_type', '=', self::class)
-            ->where('action_type', '=', 'uploaded')
-            ->whereNotNull('filename')
-            ->orderBy('created_at', 'desc');
-    }
-
-
     /**
      * Establishes the accessory -> supplier relationship
      *

app/Models/Asset.php

@@ -7,19 +7,17 @@
 use App\Helpers\Helper;
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Acceptable;
+use App\Models\Traits\HasUploads;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use App\Presenters\AssetPresenter;
-use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Model;
 
 /**
  * Model for Assets.
@@ -33,6 +31,7 @@ class Asset extends Depreciable
     protected $with = ['model', 'adminuser'];
 
     use CompanyableTrait;
+    use HasUploads;
     use HasFactory, Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait;
 
     public const LOCATION = 'location';
@@ -472,22 +471,6 @@ public function get_depreciation()
     }
 
 
-    /**
-     * Get uploads for this asset
-     *
-     * @author [A. Gianotto] [<[email protected]>]
-     * @since [v4.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->hasMany('\App\Models\Actionlog', 'item_id')
-                  ->where('item_type', '=', Asset::class)
-                  ->where('action_type', '=', 'uploaded')
-                  ->whereNotNull('filename')
-                  ->orderBy('created_at', 'desc');
-    }
-
     /**
      * Determines whether the asset is checked out to a user
      *

app/Models/AssetModel.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Models\Traits\HasUploads;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -24,6 +25,7 @@ class AssetModel extends SnipeModel
     use SoftDeletes;
     use Loggable, Requestable, Presentable;
     use TwoColumnUniqueUndeletedTrait;
+    use HasUploads;
 
     /**
      * Whether the model should inject its identifier to the unique
@@ -209,21 +211,6 @@ public function isDeletable()
             && ($this->deleted_at == '');
     }
 
-    /**
-     * Get uploads for this model
-     *
-     * @author [A. Gianotto] [<[email protected]>]
-     * @since [v4.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->hasMany('\App\Models\Actionlog', 'item_id')
-            ->where('item_type', '=', AssetModel::class)
-            ->where('action_type', '=', 'uploaded')
-            ->whereNotNull('filename')
-            ->orderBy('created_at', 'desc');
-    }
 
     /**
      * Get user who created the item

app/Models/Component.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Models\Traits\HasUploads;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -20,6 +21,7 @@ class Component extends SnipeModel
 
     protected $presenter = \App\Presenters\ComponentPresenter::class;
     use CompanyableTrait;
+    use HasUploads;
     use Loggable, Presentable;
     use SoftDeletes;
     protected $casts = [
@@ -113,21 +115,6 @@ public function isDeletable()
             && ($this->deleted_at == '');
     }
 
-    /**
-     * Establishes the components -> action logs -> uploads relationship
-     *
-     * @author A. Gianotto <[email protected]>
-     * @since [v6.1.13]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
-            ->where('item_type', '=', self::class)
-            ->where('action_type', '=', 'uploaded')
-            ->whereNotNull('filename')
-            ->orderBy('created_at', 'desc');
-    }
 
 
     /**

app/Models/Consumable.php

@@ -4,6 +4,7 @@
 
 use App\Helpers\Helper;
 use App\Models\Traits\Acceptable;
+use App\Models\Traits\HasUploads;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -29,6 +30,7 @@ class Consumable extends SnipeModel
     use Loggable, Presentable;
     use SoftDeletes;
     use Acceptable;
+    use HasUploads;
 
     protected $table = 'consumables';
     protected $casts = [
@@ -111,21 +113,6 @@ class Consumable extends SnipeModel
     ];
 
 
-    /**
-     * Establishes the components -> action logs -> uploads relationship
-     *
-     * @author A. Gianotto <[email protected]>
-     * @since [v6.1.13]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->hasMany(Actionlog::class, 'item_id')
-            ->where('item_type', '=', self::class)
-            ->where('action_type', '=', 'uploaded')
-            ->whereNotNull('filename')
-            ->orderBy('created_at', 'desc');
-    }
 
 
     /**

app/Models/License.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Helpers\Helper;
+use App\Models\Traits\HasUploads;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Carbon\Carbon;
@@ -21,6 +22,7 @@ class License extends Depreciable
 
     use SoftDeletes;
     use CompanyableTrait;
+    use HasUploads;
     use Loggable, Presentable;
     protected $injectUniqueIdentifier = true;
     use ValidatingTrait;
@@ -113,6 +115,7 @@ class License extends Depreciable
         'company'      => ['name'],
         'category'     => ['name'],
         'depreciation' => ['name'],
+        'supplier'     => ['name'],
     ];
     protected $appends = ['free_seat_count'];
 
@@ -411,21 +414,6 @@ public function assetlog()
             ->orderBy('created_at', 'desc');
     }
 
-    /**
-     * Establishes the license -> action logs -> uploads relationship
-     *
-     * @author A. Gianotto <[email protected]>
-     * @since [v2.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
-            ->where('item_type', '=', self::class)
-            ->where('action_type', '=', 'uploaded')
-            ->whereNotNull('filename')
-            ->orderBy('created_at', 'desc');
-    }
 
 
     /**

app/Models/Location.php

@@ -6,6 +6,7 @@
 use App\Models\Asset;
 use App\Models\Setting;
 use App\Models\SnipeModel;
+use App\Models\Traits\HasUploads;
 use App\Models\Traits\Searchable;
 use App\Models\User;
 use App\Presenters\Presentable;
@@ -25,6 +26,7 @@ class Location extends SnipeModel
     protected $presenter = \App\Presenters\LocationPresenter::class;
     use Presentable;
     use SoftDeletes;
+    use HasUploads;
 
     protected $table = 'locations';
     protected $rules = [
@@ -300,22 +302,6 @@ public function setLdapOuAttribute($ldap_ou)
         return $this->attributes['ldap_ou'] = empty($ldap_ou) ? null : $ldap_ou;
     }
 
-    /**
-     * Get uploads for this location
-     *
-     * @author [A. Gianotto] [<[email protected]>]
-     * @since [v4.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->hasMany('\App\Models\Actionlog', 'item_id')
-            ->where('item_type', '=', Location::class)
-            ->where('action_type', '=', 'uploaded')
-            ->whereNotNull('filename')
-            ->orderBy('created_at', 'desc');
-    }
-
 
     /**
      * Query builder scope to order on parent

app/Models/Traits/HasUploads.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models\Traits;
+
+use App\Models\Actionlog;
+
+trait HasUploads
+{
+
+    public function uploads() {
+        return $this->hasMany(Actionlog::class, 'item_id')
+            ->where('item_type', self::class)
+            ->where('action_type', '=', 'uploaded')
+            ->whereNotNull('filename');
+    }
+
+
+}

app/Models/User.php

@@ -4,6 +4,7 @@
 
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Searchable;
+use App\Models\Traits\HasUploads;
 use App\Presenters\Presentable;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
@@ -27,6 +28,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 {
     use HasFactory;
     use CompanyableTrait;
+    use HasUploads;
 
     protected $presenter = \App\Presenters\UserPresenter::class;
     use SoftDeletes, ValidatingTrait, Loggable;
@@ -530,21 +532,7 @@ public function assetlog()
         return $this->hasMany(\App\Models\Asset::class, 'id')->withTrashed();
     }
 
-    /**
-     * Establishes the user -> uploads relationship
-     *
-     * @author A. Gianotto <[email protected]>
-     * @since [v3.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
-            ->where('item_type', self::class)
-            ->where('action_type', '=', 'uploaded')
-            ->whereNotNull('filename')
-            ->orderBy('created_at', 'desc');
-    }
+
 
     /**
      * Establishes the user -> acceptances relationship

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.1.16',
-  'full_app_version' => 'v8.1.16 - build 18612-g0f92dee2c',
-  'build_version' => '18612',
+  'app_version' => 'v8.1.17',
+  'full_app_version' => 'v8.1.17 - build 18792-g33263f5a9',
+  'build_version' => '18792',
   'prerelease_version' => '',
-  'hash_version' => 'g0f92dee2c',
-  'full_hash' => 'v8.1.16-220-g0f92dee2c',
+  'hash_version' => 'g33263f5a9',
+  'full_hash' => 'v8.1.17-180-g33263f5a9',
   'branch' => 'master',
 );