diff --git a/apps/assets/migrations/0034_auto_20190705_1348.py b/apps/assets/migrations/0034_auto_20190705_1348.py index 1a1db770a..161ce2b30 100644 --- a/apps/assets/migrations/0034_auto_20190705_1348.py +++ b/apps/assets/migrations/0034_auto_20190705_1348.py @@ -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'), diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 9894bc3a9..bbf543fcb 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -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")) diff --git a/apps/perms/utils/asset_permission.py b/apps/perms/utils/asset_permission.py index eb37455c2..4ce485d71 100644 --- a/apps/perms/utils/asset_permission.py +++ b/apps/perms/utils/asset_permission.py @@ -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