Merge remote-tracking branch 'origin/develop'

Author: snipe

resources/views/custom_fields/index.blade.php

@@ -147,7 +147,6 @@ class="table table-striped snipe-table"
             <tr>
               <th data-sortable="true" data-searchable="true">{{ trans('general.name') }}</th>
               <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.help_text')}}</th>
-              <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.unique') }}</th>
               <th data-sortable="true" data-visible="false">{{ trans('admin/custom_fields/general.db_field') }}</th>
               <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.field_format') }}</th>
               <th data-sortable="true" data-tooltip="{{ trans('admin/custom_fields/general.encrypted') }}"><i
@@ -165,16 +164,18 @@ class="fa fa-eye"
                         aria-hidden="true"><span
                           class="sr-only">{{ trans('admin/custom_fields/general.display_in_user_view_table') }}</span></i>
               </th>
-              <th data-sortable="true" data-searchable="true" class="text-center"
+              <th data-sortable="true" data-searchable="false" class="text-center"
                   data-tooltip="{{ trans('admin/custom_fields/general.show_in_email_short') }}"><i
                         class="fa fa-envelope" aria-hidden="true"><span
                           class="sr-only">{{ trans('admin/custom_fields/general.show_in_email_short') }}</span></i></th>
-              <th data-sortable="true" data-searchable="true" class="text-center"
+
+              <th data-sortable="true" data-searchable="false" class="text-center"
                   data-tooltip="{{ trans('admin/custom_fields/general.show_in_requestable_list_short') }}"><i
                         class="fa fa-laptop fa-fw" aria-hidden="true"><span
                           class="sr-only">{{ trans('admin/custom_fields/general.show_in_requestable_list_short') }}</span></i>
               </th>
-              <th data-sortable="true" data-searchable="true" class="text-center"
+
+              <th data-sortable="true" data-searchable="false" class="text-center"
                   data-tooltip="{{ trans('admin/custom_fields/general.unique') }}"><i
                         class="fa-solid fa-fingerprint"><span
                           class="sr-only">{{ trans('admin/custom_fields/general.unique') }}</span></i></th>
@@ -217,8 +218,6 @@ class="sr-only">{{ trans('admin/custom_fields/general.unique') }}</span></i></th
             <tr>
               <td>{{ $field->name }}</td>
               <td>{{ $field->help_text }}</td>
-
-              <td class="text-center">{!! ($field->is_unique=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td>
                  <code>{{ $field->convertUnicodeDbSlug() }}</code>
                 @if ($field->convertUnicodeDbSlug()!=$field->db_column)