nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed second password field from configure form and validate the form completly within clean function of configure form

Browse Source
This commit is contained in:
Daniel Steglich 2015-02-24 08:16:02 +00:00
parent 5b71ce815c
commit 76f9d087c9
1 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
plinth/modules/dynamicdns/dynamicdns.py
View File

@ -98,11 +98,6 @@ class ConfigureForm(forms.Form):
help_text=_('You should have been requested to select a password \ help_text=_('You should have been requested to select a password \
when you created the account.')) when you created the account.'))
dynamicdns_secret_repeat = TrimmedCharField(
label=_('repeat Password'), widget=forms.PasswordInput(),
required=False,
help_text=_('insert the password again to avoid typos.'),)
dynamicdns_ipurl = TrimmedCharField( dynamicdns_ipurl = TrimmedCharField(
label=_('IP check URL'), label=_('IP check URL'),
required=False, required=False,
@ -118,11 +113,10 @@ class ConfigureForm(forms.Form):
def clean(self): def clean(self):
cleaned_data = super(ConfigureForm, self).clean() cleaned_data = super(ConfigureForm, self).clean()
dynamicdns_secret = cleaned_data.get("dynamicdns_secret") dynamicdns_secret = cleaned_data.get("dynamicdns_secret")
dynamicdns_secret_repeat = cleaned_data.get("dynamicdns_secret_repeat") old_dynamicdns_secret = self.initial['dynamicdns_secret']
if dynamicdns_secret or dynamicdns_secret_repeat: if not dynamicdns_secret and not old_dynamicdns_secret:
if dynamicdns_secret != dynamicdns_secret_repeat: raise forms.ValidationError("please give a password")
raise forms.ValidationError("password missmatch")
@login_required @login_required
@ -133,7 +127,7 @@ def configure(request):
form = None form = None
if request.method == 'POST': if request.method == 'POST':
form = ConfigureForm(request.POST, prefix='dynamicdns') form = ConfigureForm(request.POST, initial=status, prefix='dynamicdns')
if form.is_valid(): if form.is_valid():
_apply_changes(request, status, form.cleaned_data) _apply_changes(request, status, form.cleaned_data)
status = get_status() status = get_status()
@ -213,42 +207,38 @@ def _apply_changes(request, old_status, new_status):
LOGGER.info('New status is - %s', new_status) LOGGER.info('New status is - %s', new_status)
LOGGER.info('Old status was - %s', old_status) LOGGER.info('Old status was - %s', old_status)
if old_status['dynamicdns_secret'] == '' and \ if new_status['dynamicdns_secret'] == '':
new_status['dynamicdns_secret'] == '': new_status['dynamicdns_secret'] = old_status['dynamicdns_secret']
messages.error(request, _('please give a password'))
else:
if new_status['dynamicdns_secret'] == '':
new_status['dynamicdns_secret'] = old_status['dynamicdns_secret']
if new_status['dynamicdns_ipurl'] == '': if new_status['dynamicdns_ipurl'] == '':
new_status['dynamicdns_ipurl'] = 'none' new_status['dynamicdns_ipurl'] = 'none'
if old_status['dynamicdns_server'] != \ if old_status['dynamicdns_server'] != \
new_status['dynamicdns_server'] or \ new_status['dynamicdns_server'] or \
old_status['dynamicdns_domain'] != \ old_status['dynamicdns_domain'] != \
new_status['dynamicdns_domain'] or \ new_status['dynamicdns_domain'] or \
old_status['dynamicdns_user'] != \ old_status['dynamicdns_user'] != \
new_status['dynamicdns_user'] or \ new_status['dynamicdns_user'] or \
old_status['dynamicdns_secret'] != \ old_status['dynamicdns_secret'] != \
new_status['dynamicdns_secret'] or \ new_status['dynamicdns_secret'] or \
old_status['dynamicdns_ipurl'] != \ old_status['dynamicdns_ipurl'] != \
new_status['dynamicdns_ipurl'] or \ new_status['dynamicdns_ipurl'] or \
old_status['enabled'] != \ old_status['enabled'] != \
new_status['enabled']: new_status['enabled']:
_run(['configure', '-s', new_status['dynamicdns_server'], _run(['configure', '-s', new_status['dynamicdns_server'],
'-d', new_status['dynamicdns_domain'], '-d', new_status['dynamicdns_domain'],
'-u', new_status['dynamicdns_user'], '-u', new_status['dynamicdns_user'],
'-p', new_status['dynamicdns_secret'], '-p', new_status['dynamicdns_secret'],
'-I', new_status['dynamicdns_ipurl']]) '-I', new_status['dynamicdns_ipurl']])
if old_status['enabled']: if old_status['enabled']:
_run(['stop']) _run(['stop'])
if new_status['enabled']: if new_status['enabled']:
_run(['start']) _run(['start'])
messages.success(request, messages.success(request,
_('Dynamic DNS configuration is updated!')) _('Dynamic DNS configuration is updated!'))
def _run(arguments, superuser=False): def _run(arguments, superuser=False):