lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

wip

Browse source
This commit is contained in:
slong753 2023-05-09 14:58:59 -05:00
parent 815c77f943
commit 1d2596fc54
2 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/Http/Controllers/Assets/BulkAssetsController.php
View file

@ -16,6 +16,8 @@ use App\Http\Requests\AssetCheckoutRequest;
use App\Models\CustomField; use App\Models\CustomField;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use function Amp\Promise\wait;
class BulkAssetsController extends Controller class BulkAssetsController extends Controller
{ {
use CheckInOutRequest; use CheckInOutRequest;
@ -32,6 +34,7 @@ class BulkAssetsController extends Controller
public function edit(Request $request) public function edit(Request $request)
{ {
// dd($request->all()); // dd($request->all());
// dd(Session::get('ids'));
$this->authorize('update', Asset::class); $this->authorize('update', Asset::class);
@ -113,7 +116,9 @@ class BulkAssetsController extends Controller
$custom_field_columns = CustomField::all()->pluck('db_column')->toArray(); $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();
if (! $request->filled('ids') || count($request->input('ids')) <= 0) { if(Session::exists('ids')) {
$assets = Session::get('ids');
} elseif (! $request->filled('ids') || count($request->input('ids')) <= 0) {
return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected')); return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
} }
@ -211,7 +216,8 @@ class BulkAssetsController extends Controller
if($custom_fields_present) { if($custom_fields_present) {
$asset = Asset::find($assetId); $asset = Asset::find($assetId);
$assetCustomFields = $asset->model()->first()->fieldset; $assetCustomFields = $asset->model()->first()->fieldset;
foreach ($assetCustomFields->fields as $field) { if($assetCustomFields?->fields) {
foreach ($assetCustomFields?->fields as $field) {
if (array_key_exists($field->db_column, $this->update_array)) { if (array_key_exists($field->db_column, $this->update_array)) {
$asset->{$field->db_column} = $this->update_array[$field->db_column]; $asset->{$field->db_column} = $this->update_array[$field->db_column];
$asset->save(); $asset->save();
@ -220,16 +226,19 @@ class BulkAssetsController extends Controller
$array = $this->update_array; $array = $this->update_array;
array_except($array, $field->db_column); array_except($array, $field->db_column);
$asset->update($array); $asset->update($array);
//call update on parent model
$asset->save(); $asset->save();
} }
if (!$asset->save()) { if (!$asset->save()) {
$error_bag[] = $asset->getErrors()->toArray(); $error_bag[] = $asset->getErrors();
}
} }
} }
} else { } else {
Asset::find($assetId)->update($this->update_array); Asset::find($assetId)->update($this->update_array);
} }
} // endforeach ($assets) } // endforeach ($assets)
ray($error_bag);
if(!empty($error_bag)) { if(!empty($error_bag)) {
// $errors = collect($error_bag)->unique(); // $errors = collect($error_bag)->unique();
// foreach ($errors as $key => $value) { // foreach ($errors as $key => $value) {
@ -241,8 +250,11 @@ class BulkAssetsController extends Controller
$errors[] = $value; $errors[] = $value;
} }
} }
ray($errors); ray($error_bag);
return redirect($bulk_back_url)->with('bulk_errors', $errors); Session::save('ids', $assets);
// return redirect()->route('hardware/bulkedit');
return redirect()->back()->with('bulk_errors', $errors);
} }
return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success')); return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
} }

4
resources/views/notifications.blade.php
View file

@ -115,7 +115,7 @@
@endif @endif
@if ($messages = Session::get('bulk_errors')) {{-- @if ($messages = Session::get('bulk_errors'))
<div class="col-md-12"> <div class="col-md-12">
<div class="alert alert alert-danger fade in"> <div class="alert alert alert-danger fade in">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
@ -127,7 +127,7 @@
@endforeach @endforeach
</div> </div>
</div> </div>
@endif @endif --}}
@if ($message = Session::get('warning')) @if ($message = Session::get('warning'))