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

work on bulk tests, switching branches to check something

Browse Source
This commit is contained in:
spencerrlongg
2025-07-10 15:29:42 -05:00
parent 4d8c5a86a4
commit f1584b722d
6 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ManufacturersController.php
+8 -7
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers;
use App\Actions\Manufacturers\DestroyManufacturerAction;
use App\Actions\Manufacturers\DeleteManufacturerAction;
use App\Exceptions\ModelStillHasAccessories;
use App\Exceptions\ModelStillHasAssets;
use App\Exceptions\ModelStillHasChildren;
@@ -169,7 +169,7 @@ class ManufacturersController extends Controller
{
$this->authorize('delete', $manufacturer);
try {
DestroyManufacturerAction::run($manufacturer);
DeleteManufacturerAction::run($manufacturer);
} catch (ModelStillHasChildren $e) {
return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.assoc_users'));
} catch (\Exception $e) {
@@ -178,11 +178,12 @@ class ManufacturersController extends Controller
// Soft delete the manufacturer if active, permanent delete if is already deleted
// do we really want to do that?...
if ($manufacturer->deleted_at === null) {
$manufacturer->delete();
} else {
$manufacturer->forceDelete();
}
// commenting it out for now because it's weird
//if ($manufacturer->deleted_at === null) {
// $manufacturer->delete();
//} else {
// $manufacturer->forceDelete();
//}
// Redirect to the manufacturers management page
return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.success'));
}