From cd39e20808ef603d516ccf8ca71f3c6d750deec8 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Wed, 26 Jun 2024 19:07:28 +0800 Subject: [PATCH] perf: Applet host provider add filterset (#13517) Co-authored-by: feng <1304903146@qq.com> --- apps/accounts/models/template.py | 1 - apps/terminal/api/applet/host.py | 3 ++- apps/terminal/api/virtualapp/provider.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/accounts/models/template.py b/apps/accounts/models/template.py index 63ed1b20d..8d5be852a 100644 --- a/apps/accounts/models/template.py +++ b/apps/accounts/models/template.py @@ -29,7 +29,6 @@ class AccountTemplate(LabeledMixin, BaseAccount, SecretWithRandomMixin): ) permissions = [ ('view_accounttemplatesecret', _('Can view asset account template secret')), - ('change_accounttemplatesecret', _('Can change asset account template secret')), ] def __str__(self): diff --git a/apps/terminal/api/applet/host.py b/apps/terminal/api/applet/host.py index a67ccf9db..b66b26a5d 100644 --- a/apps/terminal/api/applet/host.py +++ b/apps/terminal/api/applet/host.py @@ -26,7 +26,8 @@ __all__ = ['AppletHostViewSet', 'AppletHostDeploymentViewSet'] class AppletHostViewSet(JMSBulkModelViewSet): serializer_class = AppletHostSerializer queryset = AppletHost.objects.all() - search_fields = ['asset_ptr__name', 'asset_ptr__address', ] + filterset_fields = ['name', 'address'] + search_fields = ['name', 'address'] rbac_perms = { 'generate_accounts': 'terminal.change_applethost', } diff --git a/apps/terminal/api/virtualapp/provider.py b/apps/terminal/api/virtualapp/provider.py index fbdf11ecc..13cab4dfe 100644 --- a/apps/terminal/api/virtualapp/provider.py +++ b/apps/terminal/api/virtualapp/provider.py @@ -17,6 +17,7 @@ __all__ = ['AppProviderViewSet', ] class AppProviderViewSet(JMSBulkModelViewSet): serializer_class = AppProviderSerializer queryset = AppProvider.objects.all() + filterset_fields = ['name', 'hostname'] search_fields = ['name', 'hostname', ] rbac_perms = { 'containers': 'terminal.view_appprovider',