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

[Bugfix] 修复一些bug

Browse Source
This commit is contained in:
ibuler
2018-01-05 17:57:02 +08:00
parent 6518ae8fa3
commit 1888c698f1
41 changed files with 357 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,6 @@ class AdminUser(AssetUser):
info = None
return info
def get_related_assets(self):
assets = []
for cluster in self.cluster_set.all():
@@ -184,6 +183,7 @@ class AdminUser(AssetUser):
class Meta:
ordering = ['name']
verbose_name = _("Admin user")
@classmethod
def generate_fake(cls, count=10):
@@ -224,7 +224,7 @@ class SystemUser(AssetUser):
def get_clusters_assets(self):
from .asset import Asset
clusters = self.cluster.all()
clusters = self.get_clusters()
return Asset.objects.filter(cluster__in=clusters)
def get_clusters(self):
@@ -262,6 +262,7 @@ class SystemUser(AssetUser):
class Meta:
ordering = ['name']
verbose_name = _("System user")
@classmethod
def generate_fake(cls, count=10):