Commit 96014760 authored by guanghongwei's avatar guanghongwei

maybe车次好了

parent e2e06713
...@@ -509,6 +509,9 @@ def chgUser(request): ...@@ -509,6 +509,9 @@ def chgUser(request):
if '' in [username, password, key_pass, name, group_post]: if '' in [username, password, key_pass, name, group_post]:
error = u'带*内容不能为空' error = u'带*内容不能为空'
if len(password) < 6 or len(key_pass) < 6:
error = u'密码长度需>6'
u = User.objects.get(username=username) u = User.objects.get(username=username)
chg_keypass = bash('ssh-keygen -p -P %s -N %s -f %s' % (jm.decrypt(u.key_pass), key_pass, keyfile)) chg_keypass = bash('ssh-keygen -p -P %s -N %s -f %s' % (jm.decrypt(u.key_pass), key_pass, keyfile))
......
...@@ -18,7 +18,7 @@ class UserAddForm(forms.Form): ...@@ -18,7 +18,7 @@ class UserAddForm(forms.Form):
password_again = forms.CharField(max_length=30, password_again = forms.CharField(max_length=30,
widget=forms.PasswordInput( widget=forms.PasswordInput(
attrs={'class': 'form-control', 'placeholder': '确认密码'})) attrs={'class': 'form-control', 'placeholder': '确认密码'}))
key_pass = forms.CharField(max_length=30, key_pass = forms.CharField(max_length=30, min_length=6,
widget=forms.PasswordInput(attrs={'class': 'form-control', 'placeholder': '密钥密码'})) widget=forms.PasswordInput(attrs={'class': 'form-control', 'placeholder': '密钥密码'}))
key_pass_again = forms.CharField(max_length=30, key_pass_again = forms.CharField(max_length=30,
widget=forms.PasswordInput( widget=forms.PasswordInput(
......
...@@ -39,15 +39,15 @@ ...@@ -39,15 +39,15 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="keypass" class="col-sm-2 control-label">密钥密码<span style="color: red"> *</span></label> <label for="key_pass" class="col-sm-2 control-label">密钥密码<span style="color: red"> *</span></label>
<div class="col-sm-4"> <div class="col-sm-4">
<input type="password" id="keypass" name="keypass" class="form-control" value="{{ user.key_pass }}" > <input type="password" id="key_pass" name="key_pass" class="form-control" value="{{ user.key_pass }}" >
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="keypass_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label> <label for="key_pass_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
<div class="col-sm-4"> <div class="col-sm-4">
<input type="password" id="keypass_again" name="keypass_again" class="form-control" value="{{ user.key_pass }}" > <input type="password" id="key_pass_again" name="key_pass_again" class="form-control" value="{{ user.key_pass }}" >
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment