From 2d129d0e31f7440d8cc0b87674020cf16a3f8d9e Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Tue, 24 Dec 2019 04:02:02 -0500 Subject: [PATCH 1/2] Backport patch that will hopefully address #781 --- helpdesk/views/login.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/views/login.py b/helpdesk/views/login.py index f2eef0dc..87a429e4 100644 --- a/helpdesk/views/login.py +++ b/helpdesk/views/login.py @@ -11,7 +11,7 @@ default_login_view = auth_views.LoginView.as_view( def login(request): login_url = settings.LOGIN_URL # Prevent redirect loop by checking that LOGIN_URL is not this view's name - if login_url and login_url != request.resolver_match.view_name: + if login_url and (login_url != resolve_url(request.resolver_match.view_name) and (login_url != request.resolver_match.view_name)): if 'next' in request.GET: return_to = request.GET['next'] else: From 62e73f8a3140ff537f294eebde8a8361aec60d28 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Tue, 24 Dec 2019 04:03:33 -0500 Subject: [PATCH 2/2] Bump version to 0.2.19 --- demo/setup.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/setup.py b/demo/setup.py index 68caaeb0..a4e66264 100644 --- a/demo/setup.py +++ b/demo/setup.py @@ -13,7 +13,7 @@ project_root = os.path.dirname(here) NAME = 'django-helpdesk-demodesk' DESCRIPTION = 'A demo Django project using django-helpdesk' README = open(os.path.join(here, 'README.rst')).read() -VERSION = '0.2.18' +VERSION = '0.2.19' #VERSION = open(os.path.join(project_root, 'VERSION')).read().strip() AUTHOR = 'django-helpdesk team' URL = 'https://github.com/django-helpdesk/django-helpdesk' diff --git a/setup.py b/setup.py index d42087dc..f285ca73 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.2.18' +version = '0.2.19' # Provided as an attribute, so you can append to these instead # of replicating them: