github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 08:19:04 +00:00
Code Issues Projects Releases Wiki Activity

[Update] Merge with dev

Browse Source
This commit is contained in:
ibuler
2018-07-25 18:18:18 +08:00
parent 2abb9efe96 e41add6126
commit 2ecfecb06f
33 changed files with 466 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/orgs/models.py
View File

@@ -55,9 +55,11 @@ class Organization(models.Model):
def get_org_users(self):
from users.models import User
if self.is_default():
return User.objects.filter(orgs__isnull=True)
users = User.objects.filter(orgs__isnull=True)
else:
return self.users.all()
users = self.users.all()
users = users.exclude(role=User.ROLE_APP)
return users
def get_org_admins(self):
if self.is_real():