Skip to content

A free open source IT asset/license management system

Set fileStorage methods

snipefb99548e9754
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 48f54980e5..ca674cb6db 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use App\Enums\FileStorage;
use App\Events\CheckoutableCheckedOut;
use App\Exceptions\CheckoutNotAllowed;
use App\Helpers\Helper;
@@ -9,6 +10,7 @@ use App\Http\Traits\UniqueUndeletedTrait;
use App\Models\Traits\Acceptable;
use App\Models\Traits\CompanyableTrait;
use App\Models\Traits\HasCalendarEvents;
+use App\Models\Traits\HasImageUpload;
use App\Models\Traits\HasOrders;
use App\Models\Traits\HasUploads;
use App\Models\Traits\Loggable;
@@ -49,6 +51,7 @@ class Asset extends Depreciable
use CompanyableTrait;
use HasCalendarEvents;
use HasFactory;
+ use HasImageUpload;
use HasOrders;
use HasUploads;
use Loggable;
@@ -66,6 +69,11 @@ class Asset extends Depreciable
use Acceptable;
+ public static function fileStorage(string $field = 'image'): FileStorage
+ {
+ return FileStorage::Assets;
+ }
+
/**
* Run after the checkout acceptance was declined by the user
*
@@ -355,7 +363,7 @@ class Asset extends Depreciable
if ($this->model_id && $this->model && (string) $this->model->require_serial === '1') {
$this->rules['serial'] = array_merge(
- array_filter($this->rules['serial'] ?? [], fn($r) => $r !== 'nullable'),
+ array_filter($this->rules['serial'] ?? [], fn ($r) => $r !== 'nullable'),
['required'],
);
}
diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php
index 0d3d447ea9..a5cc7f4f6d 100755
--- a/app/Models/AssetModel.php
+++ b/app/Models/AssetModel.php
@@ -2,7 +2,9 @@
namespace App\Models;
+use App\Enums\FileStorage;
use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
+use App\Models\Traits\HasImageUpload;
use App\Models\Traits\HasUploads;
use App\Models\Traits\Loggable;
use App\Models\Traits\Requestable;
@@ -26,11 +28,17 @@ use Watson\Validating\ValidatingTrait;
class AssetModel extends SnipeModel
{
use HasFactory;
+ use HasImageUpload;
use HasUploads;
use Loggable, Presentable, Requestable;
use SoftDeletes;
use TwoColumnUniqueUndeletedTrait;
+ public static function fileStorage(string $field = 'image'): FileStorage
+ {
+ return FileStorage::Models;
+ }
+
/**
* Whether the model should inject its identifier to the unique
* validation rules before attempting validation. If this property