ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some changes, move error bag

Browse Source
This commit is contained in:
Godfrey M
2025-06-24 13:10:32 -07:00
parent 942de9dce5
commit c8b213c190
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Assets/BulkAssetsController.php
+2 -3
View File
@@ -739,7 +739,7 @@ class BulkAssetsController extends Controller
return false; return false;
} }
public function bulkEditForm(Request $request): View|RedirectResponse public function bulkEditForm(): View|RedirectResponse
{ {
$this->authorize('update', Asset::class); $this->authorize('update', Asset::class);
@@ -765,8 +765,7 @@ class BulkAssetsController extends Controller
->with('assets', $asset_ids) ->with('assets', $asset_ids)
->with('statuslabel_list', Helper::statusLabelList()) ->with('statuslabel_list', Helper::statusLabelList())
->with('models', $models->pluck(['model'])) ->with('models', $models->pluck(['model']))
->with('modelNames', $modelNames) ->with('modelNames', $modelNames);
->with('bulk_asset_errors', session('bulk_asset_errors'));
} }
} }
resources/views/models/custom_fields_form_bulk_edit.blade.php
+1 -1
View File
@@ -143,7 +143,7 @@
<div class="col-md-8 col-md-offset-3" style="padding-bottom: 10px;"> <div class="col-md-8 col-md-offset-3" style="padding-bottom: 10px;">
<label class="form-control"> <label class="form-control">
<input type="checkbox" name="{{ 'null'.$field->db_column_name() }}" value="1" {{ old('null'.$field->db_column_name()) ? 'checked' : '' }}> <input type="checkbox" name="{{ 'null'.$field->db_column_name() }}" value="1">
{{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }} {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
</label> </label>
</div> </div>