github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-06 01:40:52 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复授权树显示

Browse Source
This commit is contained in:
Jiangjie.Bai
2022-03-14 16:43:44 +08:00
committed by 老广
parent a7cc457f54
commit cca49fa9cd
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/rbac/tree.py
View File

@@ -263,6 +263,7 @@ class PermissionTreeUtil:
@staticmethod
def _get_permission_name(p, content_types_name_mapper):
p: Permission
code_name = p.codename
action_mapper = {
'add': ugettext('Create'),
@@ -285,8 +286,9 @@ class PermissionTreeUtil:
name = action_mapper['delete']
ct = code_name.replace('delete_', '')
if ct in content_types_name_mapper:
name += content_types_name_mapper[ct]
app_model = '%s.%s' % (p.content_type.app_label, ct)
if app_model in content_types_name_mapper:
name += content_types_name_mapper[app_model]
else:
name = gettext(p.name)
name = name.replace('Can ', '').replace('可以', '')
@@ -296,7 +298,7 @@ class PermissionTreeUtil:
permissions_id = self.permissions.values_list('id', flat=True)
nodes = []
content_types = ContentType.objects.all()
content_types_name_mapper = {ct.model: ct.name for ct in content_types}
content_types_name_mapper = {ct.app_model: ct.name for ct in content_types}
for p in self.all_permissions:
model_id = f'{p.app}.{p.model}'