github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-09 19:29:48 +00:00
Code Issues Projects Releases Wiki Activity

fix: rbac 合并 (#7658)

Browse Source 
* perf: 修复一些错误权限位

* Pr@fix rbac@fix rbac permissions (#7648)

* fix: 确保每次 migrate 执行更新 role permissions

* perf: 修改 choices

* feat: 兼容apple m1

* perf: 修改 migrations role permissions

* perf: pymysql 导入

* perf: admin 判断

* fix: 修复消息订阅权限

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
Co-authored-by: feng626 <1304903146@qq.com>
This commit is contained in:
Jiangjie.Bai
2022-02-21 16:24:03 +08:00
committed by GitHub
parent 783c163324
commit 83ff8dbf26
21 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/rbac/models/role.py
View File

@@ -49,10 +49,10 @@ class Role(JMSModel):
return '%s(%s)' % (self.name, self.get_scope_display())
def is_system_admin(self):
return self.id == self.BuiltinRole.system_admin.id and self.builtin
return str(self.id) == self.BuiltinRole.system_admin.id and self.builtin
def is_org_admin(self):
return self.id == self.BuiltinRole.org_admin.id and self.builtin
return str(self.id) == self.BuiltinRole.org_admin.id and self.builtin
def is_admin(self):
yes = self.is_system_admin() or self.is_org_admin()