ui: clean up more generic forms, remove is_login everywhere

This commit is contained in:
Jens Langhammer
2020-02-21 15:00:45 +01:00
parent ea6a1422f7
commit b6326f399c
22 changed files with 423 additions and 239 deletions

View File

@ -40,7 +40,6 @@ class LoginView(UserPassesTestMixin, FormView):
def get_context_data(self, **kwargs):
kwargs["config"] = CONFIG.y("passbook")
kwargs["is_login"] = True
kwargs["title"] = _("Log in to your account")
kwargs["primary_action"] = _("Log in")
kwargs["show_sign_up_notice"] = CONFIG.y("passbook.sign_up.enabled")
@ -139,7 +138,6 @@ class SignUpView(UserPassesTestMixin, FormView):
def get_context_data(self, **kwargs):
kwargs["config"] = CONFIG.y("passbook")
kwargs["is_login"] = True
kwargs["title"] = _("Sign Up")
kwargs["primary_action"] = _("Sign up")
return super().get_context_data(**kwargs)

View File

@ -32,8 +32,6 @@ class BadRequestView(TemplateView):
response_class = BadRequestTemplateResponse
template_name = "error/400.html"
extra_context = {"is_login": True}
class ForbiddenView(TemplateView):
"""Show Forbidden message"""
@ -41,8 +39,6 @@ class ForbiddenView(TemplateView):
response_class = ForbiddenTemplateResponse
template_name = "error/403.html"
extra_context = {"is_login": True}
class NotFoundView(TemplateView):
"""Show Not Found message"""
@ -50,8 +46,6 @@ class NotFoundView(TemplateView):
response_class = NotFoundTemplateResponse
template_name = "error/404.html"
extra_context = {"is_login": True}
class ServerErrorView(TemplateView):
"""Show Server Error message"""
@ -59,8 +53,6 @@ class ServerErrorView(TemplateView):
response_class = ServerErrorTemplateResponse
template_name = "error/500.html"
extra_context = {"is_login": True}
# pylint: disable=useless-super-delegation
def dispatch(self, *args, **kwargs):
"""Little wrapper so django accepts this function"""

View File

@ -67,7 +67,6 @@ class UserChangePasswordView(LoginRequiredMixin, FormView):
def get_context_data(self, **kwargs):
kwargs["config"] = CONFIG.y("passbook")
kwargs["is_login"] = True
kwargs["title"] = _("Change Password")
kwargs["primary_action"] = _("Change")
return super().get_context_data(**kwargs)

View File

@ -15,7 +15,6 @@ class LoadingView(TemplateView):
return self.target_url
def get_context_data(self, **kwargs):
kwargs["is_login"] = True
kwargs["title"] = self.title
kwargs["target_url"] = self.get_url()
return super().get_context_data(**kwargs)
@ -28,6 +27,5 @@ class PermissionDeniedView(TemplateView):
title = _("Permission denied.")
def get_context_data(self, **kwargs):
kwargs["is_login"] = True
kwargs["title"] = self.title
return super().get_context_data(**kwargs)