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

Renamed default services to standard services

Browse Source
This commit is contained in:
fonfon 2015-05-04 10:32:53 +02:00
parent 0ffaaa3da7
commit 702dbf5e61
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plinth/modules/pagekite/forms.py
View File

@ -99,12 +99,12 @@ for your account if no secret is set on the kite'))
_run(['restart']) _run(['restart'])
class DefaultServiceForm(forms.Form): class StandardServiceForm(forms.Form):
"""Creates a form out of PREDEFINED_SERVICES""" """Creates a form out of PREDEFINED_SERVICES"""
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
"""Add the fields from PREDEFINED_SERVICES""" """Add the fields from PREDEFINED_SERVICES"""
super(DefaultServiceForm, self).__init__(*args, **kwargs) super(StandardServiceForm, self).__init__(*args, **kwargs)
kite = get_kite_details() kite = get_kite_details()
for name, service in PREDEFINED_SERVICES.items(): for name, service in PREDEFINED_SERVICES.items():
if name in ('http', 'https'): if name in ('http', 'https'):
@ -208,7 +208,7 @@ class AddCustomServiceForm(BaseCustomServiceForm):
is_predefined = False is_predefined = False
if is_predefined: if is_predefined:
msg = _("""This service is available as a default service. Please msg = _("""This service is available as a default service. Please
use the 'Default Services' page to enable it.""") use the 'Standard Services' page to enable it.""")
raise forms.ValidationError(msg) raise forms.ValidationError(msg)
return cleaned_data return cleaned_data

4
plinth/modules/pagekite/urls.py
View File

@ -22,7 +22,7 @@ URLs for the PageKite module
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from .views import DefaultServiceView, CustomServiceView, ConfigurationView, \ from .views import StandardServiceView, CustomServiceView, ConfigurationView, \
DeleteServiceView, index DeleteServiceView, index
@ -32,7 +32,7 @@ urlpatterns = patterns( # pylint: disable-msg=C0103
url(r'^apps/pagekite/configure/$', url(r'^apps/pagekite/configure/$',
login_required(ConfigurationView.as_view()), name='configure'), login_required(ConfigurationView.as_view()), name='configure'),
url(r'^apps/pagekite/services/default$', url(r'^apps/pagekite/services/default$',
login_required(DefaultServiceView.as_view()), name='default-services'), login_required(StandardServiceView.as_view()), name='default-services'),
url(r'^apps/pagekite/services/custom$', url(r'^apps/pagekite/services/custom$',
login_required(CustomServiceView.as_view()), name='custom-services'), login_required(CustomServiceView.as_view()), name='custom-services'),
url(r'^apps/pagekite/services/custom/delete$', url(r'^apps/pagekite/services/custom/delete$',

12
plinth/modules/pagekite/views.py
View File

@ -26,7 +26,7 @@ from django.views.generic.edit import FormView
from plinth import package from plinth import package
from .util import get_pagekite_config, get_pagekite_services, \ from .util import get_pagekite_config, get_pagekite_services, \
get_kite_details, prepare_service_for_display get_kite_details, prepare_service_for_display
from .forms import ConfigurationForm, DefaultServiceForm, \ from .forms import ConfigurationForm, StandardServiceForm, \
AddCustomServiceForm, DeleteCustomServiceForm AddCustomServiceForm, DeleteCustomServiceForm
@ -36,7 +36,7 @@ subsubmenu = [{'url': reverse_lazy('pagekite:index'),
{'url': reverse_lazy('pagekite:configure'), {'url': reverse_lazy('pagekite:configure'),
'text': _('Configure PageKite')}, 'text': _('Configure PageKite')},
{'url': reverse_lazy('pagekite:default-services'), {'url': reverse_lazy('pagekite:default-services'),
'text': _('Default Services')}, 'text': _('Standard Services')},
{'url': reverse_lazy('pagekite:custom-services'), {'url': reverse_lazy('pagekite:custom-services'),
'text': _('Custom Services')}] 'text': _('Custom Services')}]
@ -105,10 +105,10 @@ class CustomServiceView(ContextMixin, TemplateView):
return self.render_to_response(context) return self.render_to_response(context)
class DefaultServiceView(ContextMixin, FormView): class StandardServiceView(ContextMixin, FormView):
template_name = 'pagekite_default_services.html' template_name = 'pagekite_default_services.html'
title = 'PageKite Default Services' title = 'PageKite Standard Services'
form_class = DefaultServiceForm form_class = StandardServiceForm
success_url = reverse_lazy('pagekite:default-services') success_url = reverse_lazy('pagekite:default-services')
def get_initial(self): def get_initial(self):
@ -116,7 +116,7 @@ class DefaultServiceView(ContextMixin, FormView):
def form_valid(self, form): def form_valid(self, form):
form.save(self.request) form.save(self.request)
return super(DefaultServiceView, self).form_valid(form) return super(StandardServiceView, self).form_valid(form)
class ConfigurationView(ContextMixin, FormView): class ConfigurationView(ContextMixin, FormView):