diff --git a/apps/assets/forms.py b/apps/assets/forms.py index 415b5b9fbd116896796e1094346782052c2ec73f..2796d2528fbc666dd98bab2170124ddc242ad60e 100644 --- a/apps/assets/forms.py +++ b/apps/assets/forms.py @@ -70,7 +70,6 @@ class AssetBulkUpdateForm(forms.ModelForm): required=True, help_text='* required', label=_('Select assets'), - # choices=[(asset.id, asset.hostname) for asset in Asset.objects.all()], widget=forms.SelectMultiple( attrs={ 'class': 'select2', @@ -182,7 +181,7 @@ class AdminUserForm(forms.ModelForm): # Form field name can not start with `_`, so redefine it, password = forms.CharField( widget=forms.PasswordInput, max_length=100, - min_length=8, strip=True, required=False, + strip=True, required=False, help_text=_('If also set private key, use that first'), ) # Need use upload private key file except paste private key content @@ -239,7 +238,7 @@ class SystemUserForm(forms.ModelForm): auto_generate_key = forms.BooleanField(initial=True, required=False) # Form field name can not start with `_`, so redefine it, password = forms.CharField(widget=forms.PasswordInput, required=False, - max_length=100, min_length=8, strip=True) + max_length=100, strip=True) # Need use upload private key file except paste private key content private_key_file = forms.FileField(required=False) diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 656cad850f2028e6ec596f26ffd1420a6ad10abf..3b24b50e0a744af97b5822a85cd26662bf36d6f1 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -125,7 +125,7 @@ class Asset(models.Model): 'method': self.admin_user.become_method, 'user': self.admin_user.become_user, 'pass': self.admin_user.become_pass, - } if self.admin_user.become else {}, + } if self.admin_user and self.admin_user.become else {}, } class Meta: diff --git a/apps/assets/templates/assets/_system_user.html b/apps/assets/templates/assets/_system_user.html index 6ba33e2d7c268c2eeabb405ae6a48ab29287cf98..6549cf1012d4fc072eb05208bb81181664c2ab8b 100644 --- a/apps/assets/templates/assets/_system_user.html +++ b/apps/assets/templates/assets/_system_user.html @@ -27,11 +27,6 @@