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

quassel: Fix unable to disable application without choosing a domain name

Browse Source 
Closes #1700

Signed-off-by: Veiko Aasa <veiko17@disroot.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Veiko Aasa 2020-02-26 11:47:08 +02:00 committed by James Valleroy
parent 53bf6e28a6
commit 0c1591324d
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plinth/modules/quassel/forms.py
View File

@ -24,4 +24,5 @@ class QuasselForm(AppForm):
help_text=_( help_text=_(
'Select a domain to use TLS with. If the list is empty, please ' 'Select a domain to use TLS with. If the list is empty, please '
'configure at least one domain with certificates.'), 'configure at least one domain with certificates.'),
required=False,
) )

4
plinth/modules/quassel/views.py
View File

@ -20,7 +20,9 @@ class QuasselAppView(AppView):
def form_valid(self, form): def form_valid(self, form):
"""Change the access control of Radicale service.""" """Change the access control of Radicale service."""
data = form.cleaned_data data = form.cleaned_data
if quassel.get_domain() != data['domain']: app_disable = form.initial['is_enabled'] and not data['is_enabled']
if not app_disable and quassel.get_domain() != data['domain']:
quassel.set_domain(data['domain']) quassel.set_domain(data['domain'])
quassel.app.get_component( quassel.app.get_component(
'letsencrypt-quassel').setup_certificates() 'letsencrypt-quassel').setup_certificates()