Skip to content

A free open source IT asset/license management system

Added calendarUrl and calendarColor to presenter

snipeccbe08e9a52e
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 9ef0f5745d..a29864ff97 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -538,10 +538,10 @@ class AssetPresenter extends Presenter
public function formattedTagLink()
{
if (auth()->user()->can('view', ['\App\Models\Asset', $this])) {
- return '<a href="' . route('hardware.show', e($this->id)) . '" class="' . (($this->deleted_at != '') ? 'deleted' : '') . '">' . e($this->asset_tag) . '</a>';
+ return '<a href="'.route('hardware.show', e($this->id)).'" class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->asset_tag).'</a>';
}
- return '<span class="' . (($this->deleted_at != '') ? 'deleted' : '') . '">' . e($this->asset_tag) . '</span>';
+ return '<span class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->asset_tag).'</span>';
}
public function modelUrl()
@@ -770,4 +770,16 @@ class AssetPresenter extends Presenter
{
return '<x-icon type="assets" />';
}
+
+ public function calendarUrl(): ?string
+ {
+ return route('hardware.show', $this->model->id);
+ }
+
+ public function calendarColor(): ?string
+ {
+ return $this->model->tag_color
+ ?? $this->model->model?->category?->tag_color
+ ?? $this->model->supplier?->tag_color;
+ }
}
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 53510a1e2d..1565b083cb 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -497,4 +497,16 @@ class LicensePresenter extends Presenter
{
return route('licenses.show', $this->id);
}
+
+ public function calendarUrl(): ?string
+ {
+ return route('licenses.show', $this->model->id);
+ }
+
+ public function calendarColor(): ?string
+ {
+ return $this->model->category?->tag_color
+ ?? $this->model->manufacturer?->tag_color
+ ?? $this->model->supplier?->tag_color;
+ }
}
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 837cf674c0..6970530ed5 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -615,4 +615,15 @@ class UserPresenter extends Presenter
return '<span class="'.(($this->deleted_at != '') ? 'deleted' : '').'">'.e($this->display_name).'</span>';
}
+
+ public function calendarUrl(): ?string
+ {
+ return route('users.show', $this->model->id);
+ }
+
+ public function calendarColor(): ?string
+ {
+ return $this->model->department?->tag_color
+ ?? $this->model->company?->color;
+ }
}