Skip to content

A free open source IT asset/license management system

Small cleanup

snipe73e88be8f39f
diff --git a/app/Presenters/CustomFieldPresenter.php b/app/Presenters/CustomFieldPresenter.php
index 7a2d60be67..131cd97fac 100644
--- a/app/Presenters/CustomFieldPresenter.php
+++ b/app/Presenters/CustomFieldPresenter.php
@@ -6,51 +6,44 @@ use App\Models\CustomField;
final class CustomFieldPresenter
{
- private CustomField $field;
-
- public function __construct(CustomField $field)
- {
- $this->field = $field;
- }
-
/**
* @return string[]
*/
- public function visibilityIconsArray(): array
+ public static function visibilityIconsArray(CustomField $field): array
{
$icons = [];
- if ($this->field->display_checkout) {
+ if ($field->display_checkout) {
$label = e(trans('admin/custom_fields/general.display_checkout'));
$icons[] = '<span title="'.$label.'" data-tooltip="true"><i class="fa-solid fa-rotate-left text-muted" aria-hidden="true"></i><span class="sr-only">'.$label.'</span></span>';
}
- if ($this->field->display_checkin) {
+ if ($field->display_checkin) {
$label = e(trans('admin/custom_fields/general.display_checkin'));
$icons[] = '<span title="'.$label.'" data-tooltip="true"><i class="fa-solid fa-rotate-right text-muted" aria-hidden="true"></i><span class="sr-only">'.$label.'</span></span>';
}
- if ($this->field->display_audit) {
+ if ($field->display_audit) {
$label = e(trans('admin/custom_fields/general.display_audit'));
$icons[] = '<span title="'.$label.'" data-tooltip="true"><i class="fas fa-clipboard-check text-muted" aria-hidden="true"></i><span class="sr-only">'.$label.'</span></span>';
}
- if ($this->field->display_in_user_view) {
+ if ($field->display_in_user_view) {
$label = e(trans('admin/custom_fields/general.display_in_user_view_table'));
$icons[] = '<span title="'.$label.'" data-tooltip="true"><i class="fas fa-user text-muted" aria-hidden="true"></i><span class="sr-only">'.$label.'</span></span>';
}
- if ($this->field->show_in_listview) {
+ if ($field->show_in_listview) {
$label = e(trans('admin/custom_fields/general.show_in_listview_short'));
$icons[] = '<span title="'.$label.'" data-tooltip="true"><i class="fas fa-list text-muted" aria-hidden="true"></i><span class="sr-only">'.$label.'</span></span>';
}
- if ($this->field->show_in_email) {
+ if ($field->show_in_email) {
$label = e(trans('admin/custom_fields/general.show_in_email_short'));
$icons[] = '<span title="'.$label.'" data-tooltip="true"><i class="fas fa-envelope text-muted" aria-hidden="true"></i><span class="sr-only">'.$label.'</span></span>';
}
- if ($this->field->show_in_requestable_list) {
+ if ($field->show_in_requestable_list) {
$label = e(trans('admin/custom_fields/general.show_in_requestable_list_short'));
$icons[] = '<span title="'.$label.'" data-tooltip="true"><i class="fa-solid fa-bell-concierge text-muted" aria-hidden="true"></i><span class="sr-only">'.$label.'</span></span>';
}
@@ -58,8 +51,8 @@ final class CustomFieldPresenter
return $icons;
}
- public function visibilityIcons(): string
+ public static function visibilityIcons(CustomField $field): string
{
- return implode(' ', $this->visibilityIconsArray());
+ return implode(' ', self::visibilityIconsArray($field));
}
}
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 4d13cebf3d..39a91e694b 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -84,19 +84,15 @@
@endif
- @php
- $fieldPresenter = new \App\Presenters\CustomFieldPresenter($field);
- @endphp
-
- @if (count($fieldPresenter->visibilityIconsArray()) > 0)
+ @if (count(\App\Presenters\CustomFieldPresenter::visibilityIconsArray($field)) > 0)
@if ($field->help_text != '')
<p class="help-block">
{{ $field->help_text }}
- <span class="custom-field-visibility-icons"><br>{!! $fieldPresenter->visibilityIcons() !!}</span>
+ <br>{!! \App\Presenters\CustomFieldPresenter::visibilityIcons($field) !!}
</p>
@else
<div class="custom-field-visibility-icons">
- {!! $fieldPresenter->visibilityIcons() !!}
+ {!! \App\Presenters\CustomFieldPresenter::visibilityIcons($field) !!}
</div>
@endif
@elseif ($field->help_text != '')