diff --git a/plinth/modules/quassel/__init__.py b/plinth/modules/quassel/__init__.py
index c30f0abcc..b2a4bdb37 100644
--- a/plinth/modules/quassel/__init__.py
+++ b/plinth/modules/quassel/__init__.py
@@ -21,6 +21,7 @@ Plinth module for Quassel.
from django.utils.translation import ugettext_lazy as _
+from plinth import actions
from plinth import action_utils
from plinth import cfg
from plinth import service as service_module
@@ -68,6 +69,12 @@ def setup(helper, old_version=None):
helper.call('post', service.notify_enabled, None, True)
+def get_status():
+ """Get the current service status."""
+ return {'enabled': is_enabled(),
+ 'is_running': is_running()}
+
+
def is_enabled():
"""Return whether the service is enabled."""
return action_utils.service_is_enabled('quasselcore')
@@ -78,6 +85,13 @@ def is_running():
return action_utils.service_is_running('quasselcore')
+def enable(should_enable):
+ """Enable/disable the module."""
+ sub_command = 'enable' if should_enable else 'disable'
+ actions.superuser_run('quassel', [sub_command])
+ service.notify_enabled(None, should_enable)
+
+
def diagnose():
"""Run diagnostics and return the results."""
results = []
diff --git a/plinth/modules/quassel/forms.py b/plinth/modules/quassel/forms.py
deleted file mode 100644
index c8da8c883..000000000
--- a/plinth/modules/quassel/forms.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# This file is part of Plinth.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-
-"""
-Forms for Quassel module.
-"""
-
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-
-
-class QuasselForm(forms.Form):
- """Quassel configuration form."""
- enabled = forms.BooleanField(
- label=_('Enable Quassel core service'),
- required=False)
diff --git a/plinth/modules/quassel/urls.py b/plinth/modules/quassel/urls.py
index 5018ac2f8..3fef76f7f 100644
--- a/plinth/modules/quassel/urls.py
+++ b/plinth/modules/quassel/urls.py
@@ -21,9 +21,10 @@ URLs for the quassel module.
from django.conf.urls import url
-from . import views
+from plinth.views import ConfigurationView
urlpatterns = [
- url(r'^apps/quassel/$', views.index, name='index'),
+ url(r'^apps/quassel/$', ConfigurationView.as_view(module_name='quassel'),
+ name='index'),
]
diff --git a/plinth/modules/quassel/views.py b/plinth/modules/quassel/views.py
deleted file mode 100644
index 2adee5260..000000000
--- a/plinth/modules/quassel/views.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# This file is part of Plinth.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-
-"""
-Views for Quassel module.
-"""
-
-from django.contrib import messages
-from django.template.response import TemplateResponse
-from django.utils.translation import ugettext as _
-
-from .forms import QuasselForm
-from plinth import actions
-from plinth.modules import quassel
-
-
-def index(request):
- """Serve configuration page."""
- status = get_status()
-
- form = None
-
- if request.method == 'POST':
- form = QuasselForm(request.POST, prefix='quassel')
- if form.is_valid():
- _apply_changes(request, status, form.cleaned_data)
- status = get_status()
- form = QuasselForm(initial=status, prefix='quassel')
- else:
- form = QuasselForm(initial=status, prefix='quassel')
-
- return TemplateResponse(request, 'quassel.html',
- {'title': quassel.title,
- 'description': quassel.description,
- 'status': status,
- 'form': form})
-
-
-def get_status():
- """Get the current service status."""
- return {'enabled': quassel.is_enabled(),
- 'is_running': quassel.is_running()}
-
-
-def _apply_changes(request, old_status, new_status):
- """Apply the changes."""
- modified = False
-
- if old_status['enabled'] != new_status['enabled']:
- sub_command = 'enable' if new_status['enabled'] else 'disable'
- actions.superuser_run('quassel', [sub_command])
- quassel.service.notify_enabled(None, new_status['enabled'])
- modified = True
-
- if modified:
- messages.success(request, _('Configuration updated'))
- else:
- messages.info(request, _('Setting unchanged'))