diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index 5ef1539392..f875bad56a 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -281,6 +281,7 @@ class BulkAssetsController extends Controller || ($request->filled('null_expected_checkin_date')) || ($request->filled('null_next_audit_date')) || ($request->filled('null_asset_eol_date')) + || ($request->filled('null_notes')) || ($request->anyFilled($custom_field_columns)) || ($request->anyFilled(array_keys($null_custom_fields_inputs))) @@ -305,7 +306,8 @@ class BulkAssetsController extends Controller ->conditionallyAddItem('supplier_id') ->conditionallyAddItem('warranty_months') ->conditionallyAddItem('next_audit_date') - ->conditionallyAddItem('asset_eol_date'); + ->conditionallyAddItem('asset_eol_date') + ->conditionallyAddItem('notes'); foreach ($custom_field_columns as $key => $custom_field_column) { $this->conditionallyAddItem($custom_field_column); } @@ -362,6 +364,10 @@ class BulkAssetsController extends Controller } } + if ($request->input('null_notes')=='1') { + $this->update_array['notes'] = null; + } + if ($request->filled('purchase_cost')) { diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index 77c3173f5a..cc5983aba0 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -251,6 +251,17 @@ + @include ('partials.forms.edit.notes') +
+
+ +
+
+ + @include("models/custom_fields_form_bulk_edit",["models" => $models]) @foreach($assets as $asset) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 24a9d5f3cf..d1f22e0960 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -399,7 +399,7 @@ @if (isset($asset->expected_checkin))
  • - {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }} + {{ trans('general.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
  • @endif @@ -1094,7 +1094,7 @@
    - {{ trans('admin/hardware/form.expected_checkin') }} + {{ trans('general.expected_checkin') }}
    diff --git a/resources/views/partials/forms/edit/notes.blade.php b/resources/views/partials/forms/edit/notes.blade.php index 5f82616c2c..bba92494a1 100644 --- a/resources/views/partials/forms/edit/notes.blade.php +++ b/resources/views/partials/forms/edit/notes.blade.php @@ -2,7 +2,7 @@
    - + {!! $errors->first('notes', '') !!}