github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-25 14:50:24 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 去掉debug

Browse Source
This commit is contained in:
ibuler
2019-07-05 18:28:56 +08:00
parent a412864c80
commit aac5eed9fc
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/migrations/0034_auto_20190705_1348.py
View File

@@ -32,7 +32,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='asset',
name='protocols',
field=CharField(blank=True, max_length=128, null=True, verbose_name='Protocols'),
field=CharField(blank=True, default='ssh/22', max_length=128, verbose_name='Protocols'),
),
migrations.RunPython(migrate_assets_protocol),
migrations.DeleteModel(name='Protocol'),

2
apps/assets/models/asset.py
View File

@@ -116,7 +116,7 @@ class Asset(ProtocolsMixin, OrgModelMixin):
verbose_name=_('Protocol'))
port = models.IntegerField(default=22, verbose_name=_('Port'))
protocols = models.CharField(max_length=128, null=True, blank=True, verbose_name=_("Protocols"))
protocols = models.CharField(max_length=128, default='ssh/22', blank=True, verbose_name=_("Protocols"))
platform = models.CharField(max_length=128, choices=PLATFORM_CHOICES, default='Linux', verbose_name=_('Platform'))
domain = models.ForeignKey("assets.Domain", null=True, blank=True, related_name='assets', verbose_name=_("Domain"), on_delete=models.SET_NULL)
nodes = models.ManyToManyField('assets.Node', default=default_node, related_name='assets', verbose_name=_("Nodes"))

9
apps/perms/utils/asset_permission.py
View File

@@ -492,21 +492,14 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
for node in nodes:
pattern.add(r'^{0}$|^{0}:'.format(node.key))
pattern = '|'.join(list(pattern))
print(self.object.username)
print(pattern)
print("Start get nodes assets")
clock1 = time.clock()
if pattern:
assets = Asset.objects.filter(nodes__key__regex=pattern) \
.prefetch_related('nodes')\
.only(*self.assets_only)\
.distinct()
# .prefetch_related('nodes')\
else:
assets = []
assets = list(assets)
print("get nodes assets using: {}".format(time.clock() - clock1))
print(len(assets))
return []
self.tree.add_assets_without_system_users(assets)
assets = self.tree.get_assets()
self._assets = assets