diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index 124afa6f75..9cbb98f10e 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -220,6 +220,21 @@ class BulkAssetsController extends Controller
$custom_field_columns = CustomField::all()->pluck('db_column')->toArray();
+ // find custom field input attributes that start with 'null_'
+ $null_custom_fields_inputs = array_filter($request->all(), function ($key) {
+ // filter out all keys that start with 'null_'
+ return (strpos($key, 'null_') === 0);
+ }, ARRAY_FILTER_USE_KEY);;
+ // remove 'null' from the keys
+ $custom_fields_to_null = [];
+ foreach ($null_custom_fields_inputs as $key => $value) {
+ $custom_fields_to_null[str_replace('null', '', $key)] = $value;
+ }
+
+
+
+
+
if (! $request->filled('ids') || count($request->input('ids')) == 0) {
return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
@@ -258,6 +273,7 @@ class BulkAssetsController extends Controller
|| ($request->filled('null_next_audit_date'))
|| ($request->filled('null_asset_eol_date'))
|| ($request->anyFilled($custom_field_columns))
+ || ($request->anyFilled(array_keys($null_custom_fields_inputs)))
) {
// Let's loop through those assets and build an update array
@@ -284,6 +300,9 @@ class BulkAssetsController extends Controller
foreach ($custom_field_columns as $key => $custom_field_column) {
$this->conditionallyAddItem($custom_field_column);
}
+ foreach ($custom_fields_to_null as $key => $custom_field_to_null) {
+ $this->conditionallyAddItem($key);
+ }
if (!($asset->eol_explicit)) {
if ($request->filled('model_id')) {
@@ -429,6 +448,7 @@ class BulkAssetsController extends Controller
}
/**
+ *
* Start all the custom fields shenanigans
*/
@@ -436,6 +456,15 @@ class BulkAssetsController extends Controller
if ($asset->model->fieldset) {
foreach ($asset->model->fieldset->fields as $field) {
+ // null custom fields
+ if ($custom_fields_to_null) {
+ foreach ($custom_fields_to_null as $key => $custom_field_to_null) {
+ if ($field->db_column == $key) {
+ $this->update_array[$field->db_column] = null;
+ }
+ }
+ }
+
if ((array_key_exists($field->db_column, $this->update_array)) && ($field->field_encrypted == '1')) {
if (Gate::allows('admin')) {
$decrypted_old = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
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 3efca73258..30b26b4ae0 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -30,6 +30,12 @@
:selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
class="format form-control"
/>
+
+
+
@elseif ($field->element=='textarea')
@if($field->is_unique)
@@ -45,7 +51,6 @@
{$field->db_column_name()}))) ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}>
{{ $value }}
-
@endforeach
@elseif ($field->element=='radio')
@foreach ($field->formatFieldValuesAsArray() as $value)
@@ -119,8 +124,14 @@
@endif
-
+
+
+
- @endforeach
+
+ @endforeach
@endif
@endforeach
diff --git a/tests/Feature/Assets/Ui/BulkEditAssetsTest.php b/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
index 44e9052482..58f7a11598 100644
--- a/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
+++ b/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
@@ -197,6 +197,47 @@ class BulkEditAssetsTest extends TestCase
});
}
+ public function testBulkEditAssetsNullsCustomFieldsIfSelected()
+ {
+ $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+ CustomField::factory()->ram()->create();
+ CustomField::factory()->cpu()->create();
+ CustomField::factory()->phone()->create();
+
+ // when getting the custom field directly from the factory the field has not been fully created yet
+ // so we have to do a query afterwards to get the actual model :shrug:
+
+ $ram = CustomField::where('name', 'RAM')->first();
+ $cpu = CustomField::where('name', 'CPU')->first();
+ $phone = CustomField::where('name', 'Phone Number')->first();
+
+ $assets = Asset::factory()->count(10)->hasMultipleCustomFields([$ram, $cpu])->create([
+ $ram->db_column => 8,
+ $cpu->db_column => '2.1',
+ ]);
+
+ $id_array = $assets->pluck('id')->toArray();
+
+ $this->actingAs(User::factory()->editAssets()->create())->post(route('hardware/bulksave'), [
+ 'ids' => $id_array,
+ $ram->db_column => 16,
+ $cpu->db_column => '4.1',
+ 'null'.$phone->db_column => '8304997586',
+ ])->assertStatus(302);
+
+ $this->actingAs(User::factory()->editAssets()->create())->post(route('hardware/bulksave'), [
+ 'ids' => $id_array,
+ null.$phone->db_column => 1,
+ ]);
+
+ Asset::findMany($id_array)->each(function (Asset $asset) use ($ram, $cpu, $phone) {
+ $this->assertEquals(16, $asset->{$ram->db_column});
+ $this->assertEquals('4.1', $asset->{$cpu->db_column});
+ $this->assertEquals(null, $asset->{$phone->db_column});
+ });
+ }
+
public function testBulkEditAssetsAcceptsAndUpdatesEncryptedCustomFields()
{
$this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');