Skip to content

Commit d9e0fcc

Browse files
committed
fix: bulk edit device field values should show field name.
1 parent ca57f3c commit d9e0fcc

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

resources/views/customfield/devices.blade.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<div class="modal-dialog" role="document">
3939
<div class="modal-content">
4040
<div class="modal-header">
41-
<h5 class="modal-title" id="bulkEditModalLabel">Bulk Edit Devices</h5>
41+
<h5 class="modal-title" id="bulkEditModalLabel">Bulk Edit Devices - <span id="bulk-edit-field-name"></span></h5>
4242
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
4343
<span aria-hidden="true">&times;</span>
4444
</button>
@@ -54,7 +54,7 @@
5454
</div>
5555
<div id="alert-container" class="alert alert-warning hidden" role="alert"></div>
5656
<div class="form-group">
57-
<label for="custom-field-value">Custom Field Value</label>
57+
<label for="custom-field-value">Value for <strong id="bulk-edit-field-name-label"></strong></label>
5858
<input type="text" class="form-control" id="blkeddit-custom-field-value" name="custom_field_value" placeholder="Enter value">
5959
</div>
6060
<input type="hidden" id="blkedit_custom_field_id" name=" custom_field_id" value="{{ $customfield->id }}">
@@ -297,9 +297,16 @@
297297
let selectDevices = $('#bulk-edit-select-devices');
298298
selectDevices.empty();
299299
300-
let inputField = $('#blkedit-custom-field-value');
300+
let inputField = $('#blkeddit-custom-field-value');
301301
inputField.val('');
302302
303+
// Always hide the alert container when opening the modal
304+
$('#alert-container').addClass('hidden').empty();
305+
306+
let fieldName = $('#custom_field_id option:selected').text();
307+
$('#bulk-edit-field-name').text(fieldName);
308+
$('#bulk-edit-field-name-label').text(fieldName);
309+
303310
let selectedRowIds = grid.bootgrid("getSelectedRows");
304311
let multipleValuesWarning = 'Warning: Multiple different values selected. This will override all selected devices with this value.';
305312
@@ -312,6 +319,7 @@
312319
inputField.attr('placeholder', '');
313320
} else {
314321
inputField.val('');
322+
inputField.attr('placeholder', 'Enter new value that will replace all existing values');
315323
$('#alert-container').text(multipleValuesWarning).removeClass('hidden');
316324
}
317325
@@ -325,7 +333,7 @@
325333
$('#device_ids').val(selectedRows.map(row => row.device_id).join(","));
326334
}
327335
328-
$('#blkedit-custom-field-value').focus();
336+
$('#blkeddit-custom-field-value').focus();
329337
// set the blkedit_custom_field_id to the value of custom_field_id
330338
$('#blkedit_custom_field_id').val($("#custom_field_id").val());
331339
});

0 commit comments

Comments
 (0)