Skip to content

A free open source IT asset/license management system

Updated controllers and transfomers

snipe8378ac89c499
diff --git a/app/Http/Controllers/Api/MaintenanceTypesController.php b/app/Http/Controllers/Api/MaintenanceTypesController.php
index c8b5ef407e..146477db0a 100644
--- a/app/Http/Controllers/Api/MaintenanceTypesController.php
+++ b/app/Http/Controllers/Api/MaintenanceTypesController.php
@@ -16,7 +16,9 @@ class MaintenanceTypesController extends Controller
{
$this->authorize('view', MaintenanceType::class);
- $types = MaintenanceType::select(['id', 'name', 'created_at', 'updated_at', 'deleted_at']);
+ $types = MaintenanceType::select(['id', 'name', 'tag_color', 'created_by', 'created_at', 'updated_at', 'deleted_at'])
+ ->with('adminuser')
+ ->withCount('maintenances as maintenances_count');
if ($request->input('deleted') == 'true') {
$types->onlyTrashed();
@@ -34,7 +36,7 @@ class MaintenanceTypesController extends Controller
$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
$limit = app('api_limit_value');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
- $sort = in_array($request->input('sort'), ['id', 'name', 'created_at', 'updated_at']) ? $request->input('sort') : 'name';
+ $sort = in_array($request->input('sort'), ['id', 'name', 'maintenances_count', 'created_by', 'created_at', 'updated_at']) ? $request->input('sort') : 'name';
$types = $types->orderBy($sort, $order)->skip($offset)->take($limit)->get();
@@ -54,6 +56,7 @@ class MaintenanceTypesController extends Controller
$type = new MaintenanceType;
$type->name = $request->input('name');
+ $type->tag_color = $request->input('tag_color');
$type->created_by = auth()->id();
if ($type->save()) {
@@ -68,6 +71,7 @@ class MaintenanceTypesController extends Controller
$this->authorize('update', $maintenanceType);
$maintenanceType->name = $request->input('name');
+ $maintenanceType->tag_color = $request->input('tag_color');
if ($maintenanceType->save()) {
return response()->json(Helper::formatStandardApiResponse('success', (new MaintenanceTypesTransformer)->transformMaintenanceType($maintenanceType), trans('admin/maintenance_types/message.update.success')));
@@ -80,6 +84,23 @@ class MaintenanceTypesController extends Controller
{
$this->authorize('delete', $maintenanceType);
+ // Refuse the delete if any maintenance rows still reference this
+ // type. Enforced here as well as at the UI layer so the API
+ // doesn't strand orphaned maintenance_type_id values pointing
+ // at a soft-deleted row. Message uses the shared
+ // general.bulk_delete_associations.assoc_maintenances key so
+ // the reason surfaces the current in-use count.
+ if (! $maintenanceType->isDeletable()) {
+ return response()->json(
+ Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_maintenances', [
+ 'item_name' => $maintenanceType->name,
+ 'maintenance_count' => $maintenanceType->maintenances()->count(),
+ 'item' => trans('admin/maintenance_types/general.maintenance_type'),
+ ])),
+ 409,
+ );
+ }
+
$maintenanceType->delete();
return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/maintenance_types/message.delete.success')));
diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php
index 60493224f3..ac534a36a5 100644
--- a/app/Http/Controllers/Api/MaintenancesController.php
+++ b/app/Http/Controllers/Api/MaintenancesController.php
@@ -52,7 +52,13 @@ class MaintenancesController extends Controller
}
if ($request->filled('asset_id')) {
- $maintenances->where('asset_id', '=', $request->input('asset_id'));
+ // asset_id request param stays for API back-compat but
+ // filters against the polymorphic (item_id, item_type)
+ // pair now that maintenances can attach to accessories
+ // too. Callers filtering by asset_id are, by definition,
+ // scoping to items of type Asset.
+ $maintenances->where('item_id', '=', $request->input('asset_id'))
+ ->where('item_type', '=', Asset::class);
}
// Polymorphic filter — used by the user detail Maintenances tab to
diff --git a/app/Http/Controllers/BulkMaintenanceTypesController.php b/app/Http/Controllers/BulkMaintenanceTypesController.php
new file mode 100644
index 0000000000..3458673248
--- /dev/null
+++ b/app/Http/Controllers/BulkMaintenanceTypesController.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\MaintenanceType;
+use Illuminate\Http\Request;
+
+/**
+ * Bulk delete for MaintenanceType. Same shape as
+ * BulkManufacturersController / BulkDepreciationsController: authorize
+ * once at the class level via the policy's delete gate, then walk each
+ * requested id and guard per-row on the model's isDeletable() check
+ * (which refuses when the type still has referring maintenances).
+ * Aggregates per-row skips into a multi_error_messages flash so a
+ * partial batch still applies the safe deletes and surfaces the reason
+ * on the ones it couldn't touch.
+ */
+class BulkMaintenanceTypesController extends Controller
+{
+ public function destroy(Request $request)
+ {
+ $this->authorize('delete', MaintenanceType::class);
+
+ $errors = [];
+ $success_count = 0;
+
+ foreach ($request->ids ?? [] as $id) {
+ $type = MaintenanceType::find($id);
+ if (is_null($type)) {
+ $errors[] = trans('admin/maintenance_types/message.not_found');
+
+ continue;
+ }
+
+ if (! $type->isDeletable()) {
+ $errors[] = trans('general.bulk_delete_associations.assoc_maintenances_no_count', [
+ 'item_name' => $type->name,
+ 'item' => trans('admin/maintenance_types/general.maintenance_type'),
+ ]);
+
+ continue;
+ }
+
+ try {
+ $type->delete();
+ $success_count++;
+ } catch (\Exception $e) {
+ report($e);
+ $errors[] = trans('general.something_went_wrong');
+ }
+ }
+
+ if (count($errors) > 0) {
+ if ($success_count > 0) {
+ return redirect()->route('maintenance-types.index')
+ ->with('success', trans_choice('admin/maintenance_types/message.delete.partial_success', $success_count, ['count' => $success_count]))
+ ->with('multi_error_messages', $errors);
+ }
+
+ return redirect()->route('maintenance-types.index')->with('multi_error_messages', $errors);
+ }
+
+ return redirect()->route('maintenance-types.index')
+ ->with('success', trans_choice('admin/maintenance_types/message.delete.bulk_success', $success_count, ['count' => $success_count]));
+ }
+}
diff --git a/app/Http/Controllers/MaintenanceTypesController.php b/app/Http/Controllers/MaintenanceTypesController.php
index 2bf0c05b39..5b62aa4f34 100644
--- a/app/Http/Controllers/MaintenanceTypesController.php
+++ b/app/Http/Controllers/MaintenanceTypesController.php
@@ -29,6 +29,7 @@ class MaintenanceTypesController extends Controller
$type = new MaintenanceType;
$type->name = $request->input('name');
+ $type->tag_color = $request->input('tag_color');
$type->created_by = auth()->id();
if ($type->save()) {
@@ -39,6 +40,13 @@ class MaintenanceTypesController extends Controller
return redirect()->back()->withInput()->withErrors($type->getErrors());
}
+ public function show(MaintenanceType $maintenanceType): View
+ {
+ $this->authorize('view', $maintenanceType);
+
+ return view('maintenance-types.view')->with('item', $maintenanceType);
+ }
+
public function edit(MaintenanceType $maintenanceType): View
{
$this->authorize('update', $maintenanceType);
@@ -51,6 +59,7 @@ class MaintenanceTypesController extends Controller
$this->authorize('update', $maintenanceType);
$maintenanceType->name = $request->input('name');
+ $maintenanceType->tag_color = $request->input('tag_color');
if ($maintenanceType->save()) {
return redirect()->route('maintenance-types.index')
@@ -64,6 +73,18 @@ class MaintenanceTypesController extends Controller
{
$this->authorize('delete', $maintenanceType);
+ // Same guard as the API destroy: refuse when any maintenance row
+ // still references this type so we don't strand orphaned
+ // maintenance_type_id values on a soft-deleted parent.
+ if (! $maintenanceType->isDeletable()) {
+ return redirect()->route('maintenance-types.index')
+ ->with('error', trans('general.bulk_delete_associations.assoc_maintenances', [
+ 'item_name' => $maintenanceType->name,
+ 'maintenance_count' => $maintenanceType->maintenances()->count(),
+ 'item' => trans('admin/maintenance_types/general.maintenance_type'),
+ ]));
+ }
+
$maintenanceType->delete();
return redirect()->route('maintenance-types.index')
diff --git a/app/Http/Transformers/MaintenanceTypesTransformer.php b/app/Http/Transformers/MaintenanceTypesTransformer.php
index e067183a17..4425477d6b 100644
--- a/app/Http/Transformers/MaintenanceTypesTransformer.php
+++ b/app/Http/Transformers/MaintenanceTypesTransformer.php
@@ -24,13 +24,31 @@ class MaintenanceTypesTransformer
return [
'id' => (int) $type->id,
'name' => e($type->name),
+ 'tag_color' => $type->tag_color ? e($type->tag_color) : null,
+ // withCount('maintenances as maintenances_count') on the
+ // index query populates the count column, so the frontend
+ // can display it inline and can tell at a glance which
+ // types are unsafe to delete. show() paths that don't run
+ // withCount fall back to a live count query.
+ 'maintenances_count' => (int) ($type->maintenances_count ?? $type->maintenances()->count()),
+ 'created_by' => ($type->adminuser) ? [
+ 'id' => (int) $type->adminuser->id,
+ 'name' => e($type->adminuser->display_name),
+ ] : null,
'created_at' => Helper::getFormattedDateObject($type->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($type->updated_at, 'datetime'),
'deleted_at' => Helper::getFormattedDateObject($type->deleted_at, 'datetime'),
'available_actions' => [
'update' => Gate::allows('update', $type),
'delete' => $type->isDeletable(),
- 'restore' => Gate::allows('delete', $type),
+ // Restore is only meaningful for a soft-deleted row.
+ // Emitting restore=true on active rows made every row
+ // render a restore button (and, in combination with a
+ // false delete flag, made the actions column look like
+ // a live row could be "restored" back to itself).
+ // Match the ManufacturersTransformer / LocationsTransformer
+ // pattern: gate on trashed-and-permitted.
+ 'restore' => $type->trashed() && Gate::allows('delete', $type),
],
];
}
diff --git a/app/Http/Transformers/MaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.php
index 2bf380a777..00c5dead99 100644
--- a/app/Http/Transformers/MaintenancesTransformer.php
+++ b/app/Http/Transformers/MaintenancesTransformer.php
@@ -87,9 +87,24 @@ class MaintenancesTransformer
'id' => (int) $assetmaintenance->adminuser->id,
'name' => e($assetmaintenance->adminuser->display_name),
] : null,
+ // DEPRECATED: bare-string maintenance_type. Kept for API
+ // back-compat with callers reading this as a plain type
+ // name. New consumers should read maintenance_type_details
+ // below for id/name/tag_color, which the bootstrap-table
+ // linker formatter uses to render the type as a link to
+ // its Maintenance Types detail page.
'maintenance_type' => $assetmaintenance->maintenanceType
? e($assetmaintenance->maintenanceType->name)
: null,
+ 'maintenance_type_details' => $assetmaintenance->maintenanceType
+ ? [
+ 'id' => (int) $assetmaintenance->maintenanceType->id,
+ 'name' => e($assetmaintenance->maintenanceType->name),
+ 'tag_color' => $assetmaintenance->maintenanceType->tag_color
+ ? e($assetmaintenance->maintenanceType->tag_color)
+ : null,
+ ]
+ : null,
'responsible_party' => ($assetmaintenance->responsibleParty) ? [
'id' => (int) $assetmaintenance->responsibleParty->id,
'name' => e($assetmaintenance->responsibleParty->display_name),
@@ -150,9 +165,24 @@ class MaintenancesTransformer
'supplier' => ($assetmaintenance->supplier) ? e($assetmaintenance->supplier?->name) : null,
'url' => ($assetmaintenance->url) ? e($assetmaintenance->url) : null,
'cost' => Helper::formatCurrencyOutput($assetmaintenance->cost),
+ // DEPRECATED: bare-string maintenance_type. Kept for API
+ // back-compat with callers reading this as a plain type
+ // name. New consumers should read maintenance_type_details
+ // below for id/name/tag_color, which the bootstrap-table
+ // linker formatter uses to render the type as a link to
+ // its Maintenance Types detail page.
'maintenance_type' => $assetmaintenance->maintenanceType
? e($assetmaintenance->maintenanceType->name)
: null,
+ 'maintenance_type_details' => $assetmaintenance->maintenanceType
+ ? [
+ 'id' => (int) $assetmaintenance->maintenanceType->id,
+ 'name' => e($assetmaintenance->maintenanceType->name),
+ 'tag_color' => $assetmaintenance->maintenanceType->tag_color
+ ? e($assetmaintenance->maintenanceType->tag_color)
+ : null,
+ ]
+ : null,
'asset_maintenance_type' => e($assetmaintenance->asset_maintenance_type),
'start_date' => Helper::getFormattedDateObject($assetmaintenance->start_date, 'date'),
'asset_maintenance_time' => $assetmaintenance->asset_maintenance_time,