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

F 修复Console错误提示无权限问题

pull/103/head
vapao 2020-05-29 13:28:45 +08:00
parent 787de9c2a9
commit b9ecc1b05b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spug_api/apps/account/models.py
View File

@ -46,14 +46,14 @@ class User(models.Model, ModelMixin):
@property @property
def deploy_perms(self): def deploy_perms(self):
perms = json.loads(self.role.deploy_perms) if self.role.deploy_perms else {} perms = json.loads(self.role.deploy_perms) if self.role and self.role.deploy_perms else {}
perms.setdefault('apps', []) perms.setdefault('apps', [])
perms.setdefault('envs', []) perms.setdefault('envs', [])
return perms return perms
@property @property
def host_perms(self): def host_perms(self):
return json.loads(self.role.host_perms) if self.role.host_perms else [] return json.loads(self.role.host_perms) if self.role and self.role.host_perms else []
def has_host_perm(self, host_id): def has_host_perm(self, host_id):
if isinstance(host_id, (list, set, tuple)): if isinstance(host_id, (list, set, tuple)):

2
spug_api/apps/host/views.py
View File

@ -19,7 +19,7 @@ class HostView(View):
def get(self, request): def get(self, request):
host_id = request.GET.get('id') host_id = request.GET.get('id')
if host_id: if host_id:
if int(host_id) not in request.user.host_perms: if not request.user.has_host_perm(host_id):
return json_response(error='无权访问该主机，请联系管理员') return json_response(error='无权访问该主机，请联系管理员')
return json_response(Host.objects.get(pk=host_id)) return json_response(Host.objects.get(pk=host_id))
hosts = Host.objects.filter(deleted_by_id__isnull=True) hosts = Host.objects.filter(deleted_by_id__isnull=True)