github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-10 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Tmp org (#1579)

Browse Source 
* [Update] 添加org api, 升级到django 2.0

* [Update] fix some bug

* [Update] 修改一些bug
This commit is contained in:
老广
2018-07-24 22:21:12 -05:00
committed by GitHub
parent c816875f28
commit b156f4ad16
28 changed files with 200 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,7 @@ class User(AbstractUser):
@property
def is_org_admin(self):
if self.is_superuser or self.admin_orgs:
if self.is_superuser or self.admin_orgs.exists():
return True
else:
return False
@@ -223,7 +223,7 @@ class User(AbstractUser):
self.is_active = True
super().save(*args, **kwargs)
if current_org and current_org.is_real():
self.orgs.add(current_org)
self.orgs.add(current_org.id)
@property
def private_token(self):