entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

misc: fix typo in pass-through header form field name (#71526)
gitea/hobo/pipeline/head This commit looks good Details

This commit is contained in:
Paul Marillonnet 2023-09-21 14:23:37 +02:00
parent 30503058cc
commit 674c8bad1c
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hobo/maintenance/forms.py
View File

@ -26,7 +26,7 @@ class MaintenanceForm(forms.Form):
maintenance_page_message = forms.CharField(
required=False, widget=forms.Textarea, label=_('Maintenance page message')
)
maintenance_pass_trough_header = forms.CharField(
maintenance_pass_through_header = forms.CharField(
required=False, label=_('Maintenance HTTP header pass through')
)
maintenance_pass_through_dnswl = forms.CharField(

12
hobo/maintenance/views.py
View File

@ -38,7 +38,7 @@ class HomeView(FormView):
return get_setting_variable('MAINTENANCE_PAGE_MESSAGE')
@cached_property
def maintenance_pass_trough_header_variable(self):
def maintenance_pass_through_header_variable(self):
return get_setting_variable('MAINTENANCE_PASS_THROUGH_HEADER')
@cached_property
@ -53,7 +53,7 @@ class HomeView(FormView):
initial = super().get_initial()
initial['maintenance_page'] = bool(self.maintenance_page_variable.json)
initial['maintenance_page_message'] = self.maintenance_page_message_variable.value
initial['maintenance_pass_trough_header'] = self.maintenance_pass_trough_header_variable.value
initial['maintenance_pass_through_header'] = self.maintenance_pass_through_header_variable.value
initial['maintenance_pass_through_dnswl'] = self.maintenance_pass_through_dnswl_variable.value
initial['disable_cron'] = bool(self.tenant_disable_cron_jobs_variable.json)
return initial
@ -61,7 +61,7 @@ class HomeView(FormView):
def form_valid(self, form):
if (
form.cleaned_data['maintenance_page']
and not form.cleaned_data['maintenance_pass_trough_header']
and not form.cleaned_data['maintenance_pass_through_header']
and not form.cleaned_data['maintenance_pass_through_dnswl']
and not form.cleaned_data['confirm_maintenance_page']
):
@ -73,10 +73,10 @@ class HomeView(FormView):
self.maintenance_page_message_variable.value = form.cleaned_data['maintenance_page_message']
self.maintenance_page_message_variable.save()
self.maintenance_pass_trough_header_variable.value = form.cleaned_data[
'maintenance_pass_trough_header'
self.maintenance_pass_through_header_variable.value = form.cleaned_data[
'maintenance_pass_through_header'
]
self.maintenance_pass_trough_header_variable.save()
self.maintenance_pass_through_header_variable.save()
self.maintenance_pass_through_dnswl_variable.value = form.cleaned_data[
'maintenance_pass_through_dnswl'
]

8
tests/test_maintenance.py
View File

@ -137,7 +137,7 @@ def test_manage(app, admin_user, settings):
resp = app.get('/maintenance/')
resp.form.set('maintenance_page', True)
resp.form.set('maintenance_page_message', 'Foo')
resp.form.set('maintenance_pass_trough_header', 'X-Entrouvert')
resp.form.set('maintenance_pass_through_header', 'X-Entrouvert')
resp.form.set('disable_cron', True)
resp = resp.form.submit().follow()
assert Variable.objects.filter(name='SETTING_MAINTENANCE_PAGE').get().value == 'true'
@ -149,7 +149,7 @@ def test_manage(app, admin_user, settings):
resp.form.set('maintenance_page', False)
resp.form.set('maintenance_page_message', '')
resp.form.set('maintenance_pass_trough_header', '')
resp.form.set('maintenance_pass_through_header', '')
resp.form.set('disable_cron', False)
resp = resp.form.submit().follow()
assert Variable.objects.filter(name='SETTING_MAINTENANCE_PAGE').get().value == 'false'
@ -160,7 +160,7 @@ def test_manage(app, admin_user, settings):
# try to activate the maintenance page without pass through header
resp.form.set('maintenance_page', True)
resp.form.set('maintenance_page_message', '')
resp.form.set('maintenance_pass_trough_header', '')
resp.form.set('maintenance_pass_through_header', '')
resp.form.set('maintenance_pass_through_dnswl', '')
resp.form.set('disable_cron', False)
resp = resp.form.submit()
@ -171,7 +171,7 @@ def test_manage(app, admin_user, settings):
resp.form.set('maintenance_page', True)
resp.form.set('confirm_maintenance_page', True)
resp.form.set('maintenance_page_message', '')
resp.form.set('maintenance_pass_trough_header', '')
resp.form.set('maintenance_pass_through_header', '')
resp.form.set('maintenance_pass_through_dnswl', '')
resp.form.set('disable_cron', False)
resp = resp.form.submit().follow()