diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py index fcdb9e244..3f8849188 100644 --- a/apps/assets/models/user.py +++ b/apps/assets/models/user.py @@ -215,7 +215,7 @@ class SystemUser(ProtocolMixin, AuthMixin, BaseUser): def __str__(self): username = self.username if self.username_same_with_user: - username = 'dynamic' + username = '*' return '{0.name}({1})'.format(self, username) @property @@ -270,11 +270,6 @@ class SystemUser(ProtocolMixin, AuthMixin, BaseUser): assets = Asset.objects.filter(id__in=asset_ids) return assets - def save(self, *args, **kwargs): - if self.username_same_with_user: - self.username = '*' - return super().save(*args, **kwargs) - class Meta: ordering = ['name'] unique_together = [('name', 'org_id')] diff --git a/apps/assets/serializers/system_user.py b/apps/assets/serializers/system_user.py index abb70c47c..381b46592 100644 --- a/apps/assets/serializers/system_user.py +++ b/apps/assets/serializers/system_user.py @@ -97,13 +97,12 @@ class SystemUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer): protocol = self.initial_data.get("protocol") username_same_with_user = self.initial_data.get("username_same_with_user") - if login_mode == SystemUser.LOGIN_AUTO and \ - protocol != SystemUser.Protocol.vnc: + if username_same_with_user: + return '' + + if login_mode == SystemUser.LOGIN_AUTO and protocol != SystemUser.Protocol.vnc: msg = _('* Automatic login mode must fill in the username.') raise serializers.ValidationError(msg) - - if username_same_with_user: - username = '*' return username def validate_home(self, home):