DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Bulk edit refactor

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-10-26 01:49:23 +01:00
parent 4b6b36c639
commit 6ebc01ca50
1 changed files with 92 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,8 +120,9 @@ class BulkAssetsController extends Controller
$bulk_back_url = $request->session()->pull('bulk_back_url'); $bulk_back_url = $request->session()->pull('bulk_back_url');
} }
\Log::debug(print_r($request->all(), true));
$custom_field_columns = CustomField::all()->pluck('db_column')->toArray(); $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();
if(Session::exists('ids')) { if(Session::exists('ids')) {
$assets = Session::get('ids'); $assets = Session::get('ids');
@ -156,13 +157,14 @@ class BulkAssetsController extends Controller
) { ) {
foreach ($assets as $assetId) { foreach ($assets as $assetId) {
\Log::debug('Asset ID is: '.$assetId);
$this->update_array = []; $this->update_array = [];
$this->conditionallyAddItem('purchase_date') $this->conditionallyAddItem('purchase_date')
->conditionallyAddItem('expected_checkin') ->conditionallyAddItem('expected_checkin')
->conditionallyAddItem('model_id')
->conditionallyAddItem('order_number') ->conditionallyAddItem('order_number')
->conditionallyAddItem('requestable') ->conditionallyAddItem('requestable')
->conditionallyAddItem('model_id')
->conditionallyAddItem('status_id') ->conditionallyAddItem('status_id')
->conditionallyAddItem('supplier_id') ->conditionallyAddItem('supplier_id')
->conditionallyAddItem('warranty_months') ->conditionallyAddItem('warranty_months')
@ -187,6 +189,7 @@ class BulkAssetsController extends Controller
$this->update_array['purchase_cost'] = $request->input('purchase_cost'); $this->update_array['purchase_cost'] = $request->input('purchase_cost');
} }
if ($request->filled('company_id')) { if ($request->filled('company_id')) {
$this->update_array['company_id'] = $request->input('company_id'); $this->update_array['company_id'] = $request->input('company_id');
if ($request->input('company_id') == 'clear') { if ($request->input('company_id') == 'clear') {
@ -208,61 +211,101 @@ class BulkAssetsController extends Controller
} }
$changed = []; $changed = [];
$assetCollection = Asset::where('id' ,$assetId)->get(); $asset = Asset::find($assetId);
//dd($this->update_array);
foreach ($this->update_array as $key => $value) { foreach ($this->update_array as $key => $value) {
if ($this->update_array[$key] != $assetCollection->toArray()[0][$key]) { if ($this->update_array[$key] != $asset->{$key}) {
$changed[$key]['old'] = $assetCollection->toArray()[0][$key]; $changed[$key]['old'] = $asset->{$key};
$changed[$key]['new'] = $this->update_array[$key]; $changed[$key]['new'] = $this->update_array[$key];
} }
} }
\Log::debug('$this->update_array:');
\Log::debug(print_r($this->update_array, true));
$logAction = new Actionlog(); \Log::debug('$changed');
$logAction->item_type = Asset::class; \Log::debug(print_r($changed, true));
$logAction->item_id = $assetId;
$logAction->created_at = date("Y-m-d H:i:s");
$logAction->user_id = Auth::id();
$logAction->log_meta = json_encode($changed);
$logAction->logaction('update');
if($custom_fields_present) { if ($custom_fields_present) {
$asset = Asset::find($assetId); \Log::debug('Custom fields are present');
$assetCustomFields = $asset->model()->first()->fieldset;
if($assetCustomFields && $assetCustomFields->fields) { $model = $asset->model()->first();
foreach ($assetCustomFields->fields as $field) { // Make sure this model is valid
if (array_key_exists($field->db_column, $this->update_array)) { $assetCustomFields = ($model) ? $asset->model()->first()->fieldset : null;
$asset->{$field->db_column} = $this->update_array[$field->db_column];
$saved = $asset->save(); if ($assetCustomFields && $assetCustomFields->fields) {
if(!$saved) {
$error_bag[] = $asset->getErrors(); \Log::debug('There are custom fields on '.$assetCustomFields->name);
}
continue; foreach ($assetCustomFields->fields as $field) {
} else {
$array = $this->update_array; if ((array_key_exists($field->db_column, $this->update_array)) && ($field->field_encrypted=='1')) {
array_except($array, $field->db_column); \Log::debug('The custom field is encrypted!');
$asset->save($array); $decrypted_old = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
}
if (!$asset->save()) { // Check if the decrypted existing value is different than one we just submitted
$error_bag[] = $asset->getErrors(); // and if not, pull it out of the object
} if ($decrypted_old != $this->update_array[$field->db_column]) {
} \Log::debug('The decrypted existing value is different than the one submitted');
} $asset->{$field->db_column} = \Crypt::encrypt($this->update_array[$field->db_column]);
} else { } else {
Asset::find($assetId)->update($this->update_array); \Log::debug('The decrypted existing value is the same as the one submitted - unset it');
} unset($this->update_array[$field->db_column]);
} unset($asset->{$field->db_column});
if(!empty($error_bag)) { }
$errors = [];
//find the customfield name from the name of the messagebag items // These fields aren't encrypted, just carry on as usual
foreach ($error_bag as $key => $bag) { } else {
foreach($bag->keys() as $key => $value) { if ((array_key_exists($field->db_column, $this->update_array)) && ($asset->{$field->db_column} != $this->update_array[$field->db_column])) {
CustomField::where('db_column', $value)->get()->map(function($item) use (&$errors) { \Log::debug('The custom field value is different than the original one');
$errors[] = $item->name; $asset->{$field->db_column} = $this->update_array[$field->db_column];
}); }
}
} // endforeach
} // end custom field check
} // end custom fields handler
// Check if it passes validation, and then try to save
$has_errors = 0;
$error_array = array();
if ($asset->isValid()) {
if ($asset->update($this->update_array)) {
$logAction = new Actionlog();
$logAction->item_type = Asset::class;
$logAction->item_id = $assetId;
$logAction->created_at = date("Y-m-d H:i:s");
$logAction->user_id = Auth::id();
$logAction->log_meta = json_encode($changed);
$logAction->logaction('update');
}
\Log::debug('New asset info:');
\Log::debug('Model name: '.$asset->model->name);
\Log::debug('Asset ID '.$asset->id.' with custom fields bulk edited successfully');
} else {
$has_errors++;
\Log::debug(print_r($asset->getErrors(), true));
// Build the error array
foreach ($asset->getErrors()->toArray() as $key => $message) {
for ($x = 0; $x < count($message); $x++) {
$error_array[][] = trans('general.asset').' '.$asset->id.': '.$message[$x];
}
} }
} }
return redirect($bulk_back_url)->with('bulk_errors', array_unique($errors));
} } // end asset foreach
if ($has_errors > 0) {
\Log::debug('Ooops!');
dd($error_array);
return redirect($bulk_back_url)->with('bulk_errors', array_unique($error_array));
}
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'));
} }
// no values given, nothing to update // no values given, nothing to update
@ -284,6 +327,7 @@ class BulkAssetsController extends Controller
{ {
if (request()->filled($field)) { if (request()->filled($field)) {
$this->update_array[$field] = request()->input($field); $this->update_array[$field] = request()->input($field);
\Log::debug('Conditionally adding '.$field);
} }
return $this; return $this;