github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复用户列表角色字段不显示的问题

pull/6428/head
Bai 2021-07-13 16:21:06 +08:00 committed by Jiangjie.Bai
parent db170aac9e
commit 62ba3984bd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/users/models/user.py
View File

@ -197,7 +197,8 @@ class RoleMixin:
else: else:
# 是真实组织, 取 OrganizationMember 中的角色 # 是真实组织, 取 OrganizationMember 中的角色
roles = [ roles = [
org_member.role for org_member in self.m2m_org_members.all() getattr(ORG_ROLE, org_member.role.upper())
for org_member in self.m2m_org_members.all()
if org_member.org_id == current_org.id if org_member.org_id == current_org.id
] ]
roles.sort() roles.sort()
@ -206,7 +207,7 @@ class RoleMixin:
@lazyproperty @lazyproperty
def org_roles_label_list(self): def org_roles_label_list(self):
from orgs.models import ROLE as ORG_ROLE from orgs.models import ROLE as ORG_ROLE
return [str(ORG_ROLE[role]) for role in self.org_roles if role in ORG_ROLE] return [str(role.label) for role in self.org_roles if role in ORG_ROLE]
@lazyproperty @lazyproperty
def org_role_display(self): def org_role_display(self):