minor fixes
This commit is contained in:
parent
90937e599e
commit
8f2dcd24e9
|
@ -1355,16 +1355,17 @@ def setting_authentication():
|
||||||
local_db_enabled = True if request.form.get(
|
local_db_enabled = True if request.form.get(
|
||||||
'local_db_enabled') else False
|
'local_db_enabled') else False
|
||||||
signup_enabled = True if request.form.get(
|
signup_enabled = True if request.form.get(
|
||||||
'signup_enabled', ) else False
|
'signup_enabled') else False
|
||||||
|
print("zxsdfsdf: ", request.form.get('zxcvbn'))
|
||||||
password_package_enabled = request.form.get('zxcvbn')
|
password_package_enabled = request.form.get('zxcvbn')
|
||||||
if password_package_enabled is None:
|
if password_package_enabled is None and signup_enabled:
|
||||||
min_len = int(request.form.get('min_len'))
|
min_len = int(request.form.get('min_len'))
|
||||||
min_lowercase = int(request.form.get('min_lowercase'))
|
min_lowercase = int(request.form.get('min_lowercase'))
|
||||||
min_uppercase = int(request.form.get('min_uppercase'))
|
min_uppercase = int(request.form.get('min_uppercase'))
|
||||||
min_digits = int(request.form.get('min_digits'))
|
min_digits = int(request.form.get('min_digits'))
|
||||||
min_special = int(request.form.get('min_special'))
|
min_special = int(request.form.get('min_special'))
|
||||||
must_not_contain = request.form.get('must_not_contain')
|
must_not_contain = request.form.get('must_not_contain')
|
||||||
else:
|
elif signup_enabled:
|
||||||
Setting().set('zxcvbn_enabled', True)
|
Setting().set('zxcvbn_enabled', True)
|
||||||
|
|
||||||
if not has_an_auth_method(local_db_enabled=local_db_enabled):
|
if not has_an_auth_method(local_db_enabled=local_db_enabled):
|
||||||
|
@ -1375,13 +1376,13 @@ def setting_authentication():
|
||||||
'Must have at least one authentication method enabled.'
|
'Must have at least one authentication method enabled.'
|
||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
if password_package_enabled is None:
|
Setting().set('local_db_enabled', local_db_enabled)
|
||||||
|
Setting().set('signup_enabled', signup_enabled)
|
||||||
|
if password_package_enabled is None and signup_enabled:
|
||||||
for attribute in must_not_contain.split(","):
|
for attribute in must_not_contain.split(","):
|
||||||
if attribute not in ['firstname','lastname','username','email']:
|
if attribute not in ['firstname','lastname','username','email']:
|
||||||
result = {'status': False, 'msg': "Incorrect syntax in 'Must not contain' field"}
|
result = {'status': False, 'msg': "Incorrect syntax in 'Must not contain' field"}
|
||||||
return render_template('admin_setting_authentication.html', result=result)
|
return render_template('admin_setting_authentication.html', result=result)
|
||||||
Setting().set('local_db_enabled', local_db_enabled)
|
|
||||||
Setting().set('signup_enabled', signup_enabled)
|
|
||||||
Setting().set('pwd_min_len', min_len)
|
Setting().set('pwd_min_len', min_len)
|
||||||
Setting().set('pwd_min_lowercase', min_lowercase)
|
Setting().set('pwd_min_lowercase', min_lowercase)
|
||||||
Setting().set('pwd_min_uppercase', min_uppercase)
|
Setting().set('pwd_min_uppercase', min_uppercase)
|
||||||
|
|
|
@ -93,7 +93,7 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="min_digits">Minimum number of digits</label>
|
<label for="min_digits">Minimum number of digits</label>
|
||||||
<input type="text" class="form-control char_specified" name="min_digits" id="min_digits" value="{{ SETTING.get('pwd_min_digits') }}"
|
<input type="text" class="form-control char_specified" name="min_digits" id="min_digits" value="{{ SETTING.get('pwd_min_digits') }}"
|
||||||
{% if SETTING.get('zxcvbn_enabled')== true %}disabled{% endif %}>
|
{% if SETTING.get('zxcvbn_enabled')== true %}disabled{% endif %}>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="min_special">Minimum number of special characters</label>
|
<label for="min_special">Minimum number of special characters</label>
|
||||||
|
@ -108,7 +108,7 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>
|
<label>
|
||||||
<label for="zxcvbn">Use zxcvbn python package</label>
|
<label for="zxcvbn">Use zxcvbn python package</label>
|
||||||
<input type="checkbox" class="checkbox" name="zxcvbn" id="zxcvbn" onclick="javascript:passPolicySelection();" {% if SETTING.get('zxcvbn_enabled')== true %}checked{% endif %}>
|
<input type="checkbox" class="checkbox" name="zxcvbn" id="zxcvbn" {% if SETTING.get('zxcvbn_enabled')== true %}checked{% endif %}>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
|
Loading…
Reference in a new issue