diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index adec7a100a..752c8d64fb 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -65,6 +65,12 @@
{{ trans('admin/hardware/table.location') }} |
{{ trans('admin/hardware/table.status') }} |
{{ trans('admin/hardware/form.expected_checkin') }} |
+
+ @foreach(\App\Models\CustomField::get() as $field)
+ @if ($field->show_in_requestable_list=='1')
+ {{ $field->name }} |
+ @endif
+ @endforeach
{{ trans('table.actions') }} |
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index ac945d8597..6a2bbd7ede 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -136,6 +136,13 @@
+
+
+
+
@if (!$field->id)
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 141d715344..781f253f95 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -145,12 +145,13 @@
{{ trans('admin/custom_fields/general.encrypted') }}
|
-
+ |
{{ trans('admin/custom_fields/general.show_in_listview_short') }}
|
- Visible to User |
- Show in Email |
- {{ trans('admin/custom_fields/general.field_element_short') }} |
+ Visible to User |
+ {{ trans('admin/custom_fields/general.show_in_email_short') }} |
+ {{ trans('admin/custom_fields/general.show_in_requestable_list') }} |
+ {{ trans('admin/custom_fields/general.field_element_short') }} |
{{ trans('admin/custom_fields/general.fieldsets') }} |
{{ trans('button.actions') }} |
@@ -161,7 +162,7 @@
{{ $field->name }} |
{{ $field->help_text }} |
- {!! ($field->is_unique=='1') ? ''.trans('general.yes').'' : ''.trans('general.no').'' !!} |
+ {!! ($field->is_unique=='1') ? ''.trans('general.yes').'' : ''.trans('general.no').'' !!} |
{{ $field->convertUnicodeDbSlug() }}
@if ($field->convertUnicodeDbSlug()!=$field->db_column)
@@ -170,10 +171,11 @@
@endif
|
{{ $field->format }} |
- {!! ($field->field_encrypted=='1' ? '' : '') !!} |
- {!! ($field->show_in_listview=='1' ? '' : '') !!} |
- {!! ($field->display_in_user_view=='1' ? '' : '') !!} |
- {!! ($field->show_in_email=='1') ? ''.trans('general.yes').'' : ''.trans('general.no').'' !!} |
+ {!! ($field->field_encrypted=='1' ? '' : '') !!} |
+ {!! ($field->show_in_listview=='1' ? '' : '') !!} |
+ {!! ($field->display_in_user_view=='1' ? '' : '') !!} |
+ {!! ($field->show_in_email=='1') ? ''.trans('general.yes').'' : ''.trans('general.no').'' !!} |
+ {!! ($field->show_in_requestable_list=='1') ? ''.trans('general.yes').'' : ''.trans('general.no').'' !!} |
{{ $field->element }} |
@foreach($field->fieldset as $fieldset)
|