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

Minor yapf and isort changes

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2019-07-17 11:32:47 -07:00 committed by James Valleroy
parent 0f807bcd48
commit b0d797a84a
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plinth/modules/users/urls.py
View File

@ -18,13 +18,13 @@
URLs for the Users module URLs for the Users module
""" """
from axes.decorators import axes_dispatch
from django.conf.urls import url from django.conf.urls import url
from django.urls import reverse_lazy from django.urls import reverse_lazy
from stronghold.decorators import public
from axes.decorators import axes_dispatch
from plinth.modules.sso.views import SSOLoginView, SSOLogoutView from plinth.modules.sso.views import SSOLoginView, SSOLogoutView
from plinth.utils import non_admin_view from plinth.utils import non_admin_view
from stronghold.decorators import public
from . import views from . import views
@ -33,8 +33,8 @@ urlpatterns = [
url(r'^sys/users/create/$', views.UserCreate.as_view(), name='create'), url(r'^sys/users/create/$', views.UserCreate.as_view(), name='create'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/edit/$', url(r'^sys/users/(?P<slug>[\w.@+-]+)/edit/$',
non_admin_view(views.UserUpdate.as_view()), name='edit'), non_admin_view(views.UserUpdate.as_view()), name='edit'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/delete/$', url(r'^sys/users/(?P<slug>[\w.@+-]+)/delete/$', views.UserDelete.as_view(),
views.UserDelete.as_view(), name='delete'), name='delete'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/change_password/$', url(r'^sys/users/(?P<slug>[\w.@+-]+)/change_password/$',
non_admin_view(views.UserChangePassword.as_view()), non_admin_view(views.UserChangePassword.as_view()),
name='change_password'), name='change_password'),
@ -43,11 +43,10 @@ urlpatterns = [
# XXX: Use axes authentication backend and middleware instead of # XXX: Use axes authentication backend and middleware instead of
# axes_dispatch after axes 5.x becomes available in Debian stable. # axes_dispatch after axes 5.x becomes available in Debian stable.
url(r'^accounts/login/$', url(r'^accounts/login/$', public(axes_dispatch(SSOLoginView.as_view())),
public(axes_dispatch(SSOLoginView.as_view())), name='login'), name='login'),
url(r'^accounts/logout/$', url(r'^accounts/logout/$', non_admin_view(SSOLogoutView.as_view()),
non_admin_view(SSOLogoutView.as_view()),
{'next_page': reverse_lazy('index')}, name='logout'), {'next_page': reverse_lazy('index')}, name='logout'),
url(r'^users/firstboot/$', url(r'^users/firstboot/$', public(views.FirstBootView.as_view()),
public(views.FirstBootView.as_view()), name='firstboot'), name='firstboot'),
] ]

8
plinth/web_framework.py
View File

@ -179,13 +179,15 @@ def get_languages():
Add additional languages that FreedomBox support but Django doesn't. Add additional languages that FreedomBox support but Django doesn't.
""" """
def gettext_noop(string): def gettext_noop(string):
"""Django's actual translation methods need Django to be setup.""" """Django's actual translation methods need Django to be setup."""
return string return string
return sorted(list(global_settings.LANGUAGES) + [ return sorted(
('gu', gettext_noop('Gujarati')), list(global_settings.LANGUAGES) + [
]) ('gu', gettext_noop('Gujarati')),
])
def get_wsgi_application(): def get_wsgi_application():