diff --git a/resources/lang/en/admin/hardware/form.php b/resources/lang/en/admin/hardware/form.php index 679f0d94ae..b6fabe57a2 100644 --- a/resources/lang/en/admin/hardware/form.php +++ b/resources/lang/en/admin/hardware/form.php @@ -12,6 +12,7 @@ return [ 'bulk_update_warn' => 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.', 'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.', 'bulk_update_model_prefix' => 'On Models:', + 'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.', 'checkedout_to' => 'Checked Out To', 'checkout_date' => 'Checkout Date', 'checkin_date' => 'Checkin Date', diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php index ee05fa4aab..9652d35d8d 100644 --- a/resources/views/models/custom_fields_form_bulk_edit.blade.php +++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php @@ -20,15 +20,6 @@
- {{-- @if ($field->is_unique) -
- -
- @else --}} - @if ($field->element!='text') @@ -38,7 +29,7 @@ @elseif ($field->element=='textarea') @if($field->is_unique) - + @endif @if(!$field->is_unique) @@ -82,7 +73,7 @@ @if (($field->field_encrypted=='0') || (Gate::allows('admin'))) @if ($field->is_unique) - + @endif @if(!$field->is_unique) @@ -98,10 +89,6 @@ @if ($field->help_text!='')

{{ $field->help_text }}

@endif - {{-- @if ($field->is_unique) -

Unique, Can't Be Bulk Updated

- @endif --}} -

{{ trans('admin/hardware/form.bulk_update_model_prefix') }} @foreach($field->assetModels() as $assetModel) @@ -131,7 +118,6 @@

- {{-- @endif --}} @endforeach @endif @endforeach