Skip to content

A free open source IT asset/license management system

Check for deletability in groups

sniped36e17eaaeff
diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php
index 05645bcc37..2498a9f361 100644
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -146,6 +146,10 @@ class GroupsController extends Controller
{
$this->authorize('superadmin');
$group = Group::findOrFail($id);
+ if (!$group->isDeletable()) {
+ return response()
+ ->json(Helper::formatStandardApiResponse('error', null, trans('admin/locations/message.assoc_users')));
+ }
$group->delete();
return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/groups/message.delete.success')));
diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php
index 2ce427d74c..c6593f2c12 100755
--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -207,9 +207,15 @@ class GroupsController extends Controller
public function destroy($id): RedirectResponse
{
if (! config('app.lock_passwords')) {
+
if (! $group = Group::find($id)) {
return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
}
+
+ if (!$group->isDeletable()) {
+ return redirect()->route('groups.index')->with('error', trans('admin/locations/message.assoc_users'));
+ }
+
$group->delete();
return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.delete'));
diff --git a/app/Http/Transformers/GroupsTransformer.php b/app/Http/Transformers/GroupsTransformer.php
index c9122aa11a..a10e11577c 100644
--- a/app/Http/Transformers/GroupsTransformer.php
+++ b/app/Http/Transformers/GroupsTransformer.php
@@ -37,7 +37,7 @@ class GroupsTransformer
$permissions_array['available_actions'] = [
'update' => Gate::allows('superadmin') ? true : false,
- 'delete' => Gate::allows('superadmin') ? true : false,
+ 'delete' => $group->isDeletable() ? true : false,
];
$array += $permissions_array;
diff --git a/app/Models/Group.php b/app/Models/Group.php
index f872a07425..dd00417dc7 100755
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -3,13 +3,17 @@
namespace App\Models;
use App\Models\Traits\Searchable;
+use App\Presenters\GroupPresenter;
+use App\Presenters\Presentable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Support\Facades\Gate;
use Watson\Validating\ValidatingTrait;
class Group extends SnipeModel
{
use HasFactory;
+ use Presentable;
protected $table = 'permission_groups';
@@ -31,6 +35,7 @@ class Group extends SnipeModel
* @var bool
*/
protected $injectUniqueIdentifier = true;
+ protected $presenter = GroupPresenter::class;
use Searchable;
use ValidatingTrait;
@@ -49,6 +54,13 @@ class Group extends SnipeModel
*/
protected $searchableRelations = [];
+
+ public function isDeletable()
+ {
+ return Gate::allows('delete', $this)
+ && (($this->users_count ?? $this->users()->count()) === 0);
+ }
+
/**
* Establishes the groups -> users relationship
*