Commit b0d797a8 authored by Sunil Mohan Adapa's avatar Sunil Mohan Adapa Committed by James Valleroy

Minor yapf and isort changes

Signed-off-by: Sunil Mohan Adapa's avatarSunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy's avatarJames Valleroy <jvalleroy@mailbox.org>
parent 0f807bcd
Pipeline #57359 failed with stages
in 11 minutes and 26 seconds
......@@ -18,13 +18,13 @@
URLs for the Users module
"""
from axes.decorators import axes_dispatch
from django.conf.urls import url
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.utils import non_admin_view
from stronghold.decorators import public
from . import views
......@@ -33,8 +33,8 @@ urlpatterns = [
url(r'^sys/users/create/$', views.UserCreate.as_view(), name='create'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/edit/$',
non_admin_view(views.UserUpdate.as_view()), name='edit'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/delete/$',
views.UserDelete.as_view(), name='delete'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/delete/$', views.UserDelete.as_view(),
name='delete'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/change_password/$',
non_admin_view(views.UserChangePassword.as_view()),
name='change_password'),
......@@ -43,11 +43,10 @@ urlpatterns = [
# XXX: Use axes authentication backend and middleware instead of
# axes_dispatch after axes 5.x becomes available in Debian stable.
url(r'^accounts/login/$',
public(axes_dispatch(SSOLoginView.as_view())), name='login'),
url(r'^accounts/logout/$',
non_admin_view(SSOLogoutView.as_view()),
url(r'^accounts/login/$', public(axes_dispatch(SSOLoginView.as_view())),
name='login'),
url(r'^accounts/logout/$', non_admin_view(SSOLogoutView.as_view()),
{'next_page': reverse_lazy('index')}, name='logout'),
url(r'^users/firstboot/$',
public(views.FirstBootView.as_view()), name='firstboot'),
url(r'^users/firstboot/$', public(views.FirstBootView.as_view()),
name='firstboot'),
]
......@@ -179,13 +179,15 @@ def get_languages():
Add additional languages that FreedomBox support but Django doesn't.
"""
def gettext_noop(string):
"""Django's actual translation methods need Django to be setup."""
return string
return sorted(list(global_settings.LANGUAGES) + [
('gu', gettext_noop('Gujarati')),
])
return sorted(
list(global_settings.LANGUAGES) + [
('gu', gettext_noop('Gujarati')),
])
def get_wsgi_application():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment