diff --git a/apps/assets/views/admin_user.py b/apps/assets/views/admin_user.py index 089efe352..5ba6246c8 100644 --- a/apps/assets/views/admin_user.py +++ b/apps/assets/views/admin_user.py @@ -106,8 +106,6 @@ class AdminUserAssetsView(PermissionsMixin, SingleObjectMixin, ListView): context = { 'app': _('Assets'), 'action': _('Admin user detail'), - "total_amount": len(self.queryset), - 'unreachable_amount': len([asset for asset in self.queryset if asset.connectivity is False]) } kwargs.update(context) return super().get_context_data(**kwargs) diff --git a/apps/common/mixins/serializers.py b/apps/common/mixins/serializers.py index 008cd5eee..5f8668b93 100644 --- a/apps/common/mixins/serializers.py +++ b/apps/common/mixins/serializers.py @@ -32,8 +32,6 @@ class BulkSerializerMixin(object): id_value = id_field.to_internal_value(data.get("id")) else: id_value = id_field.to_internal_value(data.get("pk")) - print(">>>>>>>>>>>>>>>>>>>") - print(id_attr) ret[id_attr] = id_value return ret diff --git a/apps/orgs/mixins/models.py b/apps/orgs/mixins/models.py index d579bab37..a928ea0f3 100644 --- a/apps/orgs/mixins/models.py +++ b/apps/orgs/mixins/models.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # +import traceback from django.db import models from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import ValidationError diff --git a/apps/perms/utils/asset_permission.py b/apps/perms/utils/asset_permission.py index 351df2a2d..4273e197e 100644 --- a/apps/perms/utils/asset_permission.py +++ b/apps/perms/utils/asset_permission.py @@ -513,7 +513,6 @@ class AssetPermissionUtil(AssetPermissionCacheMixin): """ self.get_assets_without_cache() nodes_assets = self.tree.get_nodes_with_assets() - print(nodes_assets.keys()) return nodes_assets def get_system_users_without_cache(self): diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index b22516863..a90ccd64c 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -608,7 +608,10 @@ jumpserver.initServerSideDataTable = function (options) { search_list.map(function (val, index) { var kv = val.split(":"); if (kv.length === 2) { - search_attr[kv[0]] = kv[1] + var value = kv[1]; + value = value.replace("+", " "); + console.log(value); + search_attr[kv[0]] = value } else { search_raw.push(kv) }