diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py index e279bc0ec..45254c3a4 100644 --- a/apps/assets/views/asset.py +++ b/apps/assets/views/asset.py @@ -28,7 +28,7 @@ from common.mixins import JSONResponseMixin from common.utils import get_object_or_none, get_logger, is_uuid from common.const import create_success_msg, update_success_msg from .. import forms -from ..models import Asset, AdminUser, SystemUser, Label, Node +from ..models import Asset, AdminUser, SystemUser, Label, Node, Domain from ..hands import AdminUserRequiredMixin @@ -279,6 +279,7 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView): asset_dict = dict(zip(attr, row)) id_ = asset_dict.pop('id', 0) for k, v in asset_dict.items(): + v = v.strip() if k == 'is_active': v = True if v in ['TRUE', 1, 'true'] else False elif k == 'admin_user': @@ -288,8 +289,8 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView): v = int(v) except ValueError: v = 0 - else: - continue + elif k == 'domain': + v = get_object_or_none(Domain, name=v) asset_dict[k] = v asset = get_object_or_none(Asset, id=id_) if is_uuid(id_) else None diff --git a/apps/users/views/group.py b/apps/users/views/group.py index 958c00ccc..1fcec8ca7 100644 --- a/apps/users/views/group.py +++ b/apps/users/views/group.py @@ -74,7 +74,7 @@ class UserGroupDetailView(AdminUserRequiredMixin, DetailView): template_name = 'users/user_group_detail.html' def get_context_data(self, **kwargs): - users = User.objects.exclude(id__in=self.object.users.all()) + users = User.objects.exclude(id__in=self.object.users.all()).exclude(role=User.ROLE_APP) context = { 'app': _('Users'), 'action': _('User group detail'),