diff --git a/plinth/modules/ikiwiki/urls.py b/plinth/modules/ikiwiki/urls.py index d366d2114..2b5d9fbe9 100644 --- a/plinth/modules/ikiwiki/urls.py +++ b/plinth/modules/ikiwiki/urls.py @@ -26,6 +26,7 @@ urlpatterns = patterns( 'plinth.modules.ikiwiki.views', url(r'^apps/ikiwiki/$', 'index', name='index'), url(r'^apps/ikiwiki/manage/$', 'manage', name='manage'), - url(r'^apps/ikiwiki/(?P[\w.@+-]+)/delete/$', 'delete', name='delete'), + url(r'^apps/ikiwiki/(?P[\w.@+-]+)/delete/$', + 'delete', name='delete'), url(r'^apps/ikiwiki/create/$', 'create', name='create'), ) diff --git a/plinth/modules/ikiwiki/views.py b/plinth/modules/ikiwiki/views.py index 4be035a56..43c762af4 100644 --- a/plinth/modules/ikiwiki/views.py +++ b/plinth/modules/ikiwiki/views.py @@ -25,16 +25,12 @@ from django.core.urlresolvers import reverse_lazy from django.shortcuts import redirect from django.template.response import TemplateResponse from gettext import gettext as _ -import logging from .forms import IkiwikiForm, IkiwikiCreateForm from plinth import actions from plinth import package -from plinth.modules import ikiwiki -LOGGER = logging.getLogger(__name__) - subsubmenu = [{'url': reverse_lazy('ikiwiki:index'), 'text': _('Configure')}, {'url': reverse_lazy('ikiwiki:manage'), @@ -44,7 +40,9 @@ subsubmenu = [{'url': reverse_lazy('ikiwiki:index'), @login_required -@package.required(['ikiwiki', 'libcgi-formbuilder-perl', 'libcgi-session-perl']) +@package.required(['ikiwiki', + 'libcgi-formbuilder-perl', + 'libcgi-session-perl']) def index(request): """Serve configuration page.""" status = get_status() @@ -131,11 +129,10 @@ def create(request): def _create_wiki(request, name, admin_name, admin_password): """Create wiki.""" try: - output = actions.superuser_run( + actions.superuser_run( 'ikiwiki', ['create-wiki', '--wiki_name', name, '--admin_name', admin_name, '--admin_password', admin_password]) - #LOGGER.info('create wiki: %s' % output) messages.success(request, _('Created wiki %s.') % name) except actions.ActionError as err: messages.error(request, _('Could not create wiki: %s') % err) @@ -144,11 +141,10 @@ def _create_wiki(request, name, admin_name, admin_password): def _create_blog(request, name, admin_name, admin_password): """Create blog.""" try: - output = actions.superuser_run( + actions.superuser_run( 'ikiwiki', ['create-blog', '--blog_name', name, '--admin_name', admin_name, '--admin_password', admin_password]) - #LOGGER.info('create blog: %s' % output) messages.success(request, _('Created blog %s.') % name) except actions.ActionError as err: messages.error(request, _('Could not create blog: %s') % err)