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

resolved merge conflicts

Browse source
This commit is contained in:
Godfrey M 2024-03-06 14:48:47 -08:00
parent feb78d00cf
commit d78262f52b
2 changed files with 40 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,7 @@ class BulkAssetsController extends Controller
} }
$asset_ids = $request->input('ids'); $asset_ids = $request->input('ids');
// Figure out where we need to send the user after the update is complete, and store that in the session // Figure out where we need to send the user after the update is complete, and store that in the session
$bulk_back_url = request()->headers->get('referer'); $bulk_back_url = request()->headers->get('referer');
session(['bulk_back_url' => $bulk_back_url]); session(['bulk_back_url' => $bulk_back_url]);
@ -92,41 +93,6 @@ class BulkAssetsController extends Controller
$assets = Asset::with('assignedTo', 'location', 'model')->whereIn('assets.id', $asset_ids); $assets = Asset::with('assignedTo', 'location', 'model')->whereIn('assets.id', $asset_ids);
switch ($sort_override) {
case 'model':
$assets->OrderModels($order);
break;
case 'model_number':
$assets->OrderModelNumber($order);
break;
case 'category':
$assets->OrderCategory($order);
break;
case 'manufacturer':
$assets->OrderManufacturer($order);
break;
case 'company':
$assets->OrderCompany($order);
break;
case 'location':
$assets->OrderLocation($order);
case 'rtd_location':
$assets->OrderRtdLocation($order);
break;
case 'status_label':
$assets->OrderStatus($order);
break;
case 'supplier':
$assets->OrderSupplier($order);
break;
case 'assigned_to':
$assets->OrderAssigned($order);
break;
default:
$assets->orderBy($column_sort, $order);
break;
}
$assets = $assets->get(); $assets = $assets->get();
$models = $assets->unique('model_id'); $models = $assets->unique('model_id');
@ -137,6 +103,7 @@ class BulkAssetsController extends Controller
if ($request->filled('bulk_actions')) { if ($request->filled('bulk_actions')) {
switch ($request->input('bulk_actions')) { switch ($request->input('bulk_actions')) {
case 'labels': case 'labels':
$this->authorize('view', Asset::class); $this->authorize('view', Asset::class);
@ -174,6 +141,41 @@ class BulkAssetsController extends Controller
} }
} }
switch ($sort_override) {
case 'model':
$assets->OrderModels($order);
break;
case 'model_number':
$assets->OrderModelNumber($order);
break;
case 'category':
$assets->OrderCategory($order);
break;
case 'manufacturer':
$assets->OrderManufacturer($order);
break;
case 'company':
$assets->OrderCompany($order);
break;
case 'location':
$assets->OrderLocation($order);
case 'rtd_location':
$assets->OrderRtdLocation($order);
break;
case 'status_label':
$assets->OrderStatus($order);
break;
case 'supplier':
$assets->OrderSupplier($order);
break;
case 'assigned_to':
$assets->OrderAssigned($order);
break;
default:
$assets->orderBy($column_sort, $order);
break;
}
return redirect()->back()->with('error', 'No action selected'); return redirect()->back()->with('error', 'No action selected');
} }

4
app/View/Label.php
View file

@ -72,6 +72,7 @@ class Label implements View
$fieldDefinitions = collect(explode(';', $settings->label2_fields)) $fieldDefinitions = collect(explode(';', $settings->label2_fields))
->filter(fn($fieldString) => !empty($fieldString)) ->filter(fn($fieldString) => !empty($fieldString))
->map(fn($fieldString) => Field::fromString($fieldString)); ->map(fn($fieldString) => Field::fromString($fieldString));
// Prepare data // Prepare data
$data = $assets $data = $assets
->map(function ($asset) use ($template, $settings, $fieldDefinitions) { ->map(function ($asset) use ($template, $settings, $fieldDefinitions) {
@ -126,7 +127,7 @@ class Label implements View
switch ($settings->label2_2d_target) { switch ($settings->label2_2d_target) {
case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break; case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
case 'hardware_id': case 'hardware_id':
default: $barcode2DTarget = route('hardware.show',['hardware' => $asset->id]); break; default: $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); break;
} }
$assetData->put('barcode2d', (object)[ $assetData->put('barcode2d', (object)[
'type' => $barcode2DType, 'type' => $barcode2DType,
@ -146,6 +147,7 @@ class Label implements View
return $toAdd ? $myFields->push($toAdd) : $myFields; return $toAdd ? $myFields->push($toAdd) : $myFields;
}, new Collection()); }, new Collection());
$assetData->put('fields', $fields->take($template->getSupportFields())); $assetData->put('fields', $fields->take($template->getSupportFields()));
return $assetData; return $assetData;