From 44fb59eb182497cdf81d3e06fcc3377091dd2789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simonyi=20Gerg=C5=91?= <28359278+gergosimonyi@users.noreply.github.com> Date: Fri, 2 May 2025 17:42:19 +0200 Subject: [PATCH] rbac: fix RoleObjectPermissionTable not showing `add_user_to_group` (#14312) fix RoleObjectPermissionTable not showing `add_user_to_group` --- .../admin/rbac/RoleObjectPermissionForm.ts | 29 +++++++++++-------- .../admin/rbac/RoleObjectPermissionTable.ts | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/web/src/admin/rbac/RoleObjectPermissionForm.ts b/web/src/admin/rbac/RoleObjectPermissionForm.ts index f423c59742..41be918f26 100644 --- a/web/src/admin/rbac/RoleObjectPermissionForm.ts +++ b/web/src/admin/rbac/RoleObjectPermissionForm.ts @@ -89,19 +89,24 @@ export class RoleObjectPermissionForm extends ModelForm > - ${this.modelPermissions?.results.map((perm) => { - return html` - - `; - })} + ${perm.name} + + `; + })} `; } } diff --git a/web/src/admin/rbac/RoleObjectPermissionTable.ts b/web/src/admin/rbac/RoleObjectPermissionTable.ts index 82e8d488cd..f6b1a79fc5 100644 --- a/web/src/admin/rbac/RoleObjectPermissionTable.ts +++ b/web/src/admin/rbac/RoleObjectPermissionTable.ts @@ -45,7 +45,7 @@ export class RoleAssignedObjectPermissionTable extends Table { - return !value.codename.startsWith("add_"); + return value.codename !== `add_${this.model?.split(".")[1]}`; }); this.modelPermissions = modelPermissions; return perms;