configuration: Fix parsing error in retrieving default app

- some minor refactoring
- optimized imports

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
This commit is contained in:
Joseph Nuthalapati 2018-07-30 15:23:51 +05:30
parent 9781cc0cb8
commit 0023481d48
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
2 changed files with 5 additions and 6 deletions

View File

@ -66,7 +66,7 @@ def get_default_app():
if aug.get(match + "/arg[1]") == '''"^/$"''':
app_path = aug.get(match + "/arg[2]")
return app_path.strip("/")
return app_path.strip('"').strip('/')
def init():

View File

@ -19,13 +19,12 @@ FreedomBox views for basic system configuration.
"""
import logging
import re
from django.contrib import messages
from django.template.response import TemplateResponse
from django.utils.translation import ugettext as _
from plinth import action_utils, actions, frontpage
from plinth import actions, frontpage
from plinth.modules import config, firewall
from plinth.modules.names import SERVICES
from plinth.signals import (domain_added, domain_removed, domainname_change,
@ -38,7 +37,7 @@ LOGGER = logging.getLogger(__name__)
def index(request):
"""Serve the configuration form"""
status = get_status(request)
status = get_status()
if request.method == 'POST':
form = ConfigurationForm(request.POST, initial=status,
@ -46,7 +45,7 @@ def index(request):
# pylint: disable-msg=E1101
if form.is_valid():
_apply_changes(request, status, form.cleaned_data)
status = get_status(request)
status = get_status()
form = ConfigurationForm(initial=status, prefix='configuration')
else:
form = ConfigurationForm(initial=status, prefix='configuration')
@ -59,7 +58,7 @@ def index(request):
})
def get_status(request):
def get_status():
"""Return the current status"""
return {
'hostname': config.get_hostname(),