Fix subdomain login
This commit is contained in:
parent
15913e51f3
commit
3791d2e90f
1 changed files with 8 additions and 5 deletions
|
@ -1,5 +1,5 @@
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.http import HttpResponseRedirect
|
from django.http import HttpResponseRedirect, Http404
|
||||||
from django.urls import Resolver404, resolve, reverse
|
from django.urls import Resolver404, resolve, reverse
|
||||||
from django.utils.http import urlquote
|
from django.utils.http import urlquote
|
||||||
from django.contrib.sites.shortcuts import get_current_site
|
from django.contrib.sites.shortcuts import get_current_site
|
||||||
|
@ -106,10 +106,13 @@ class SubdomainMiddleware(object):
|
||||||
and organization in request.profile.organizations.all()
|
and organization in request.profile.organizations.all()
|
||||||
):
|
):
|
||||||
request.organization = organization
|
request.organization = organization
|
||||||
elif not request.GET.get("next", None):
|
else:
|
||||||
return HttpResponseRedirect(
|
if request.profile:
|
||||||
reverse("auth_login") + "?next=" + urlquote(request.path)
|
raise Http404
|
||||||
)
|
if not request.GET.get("next", None):
|
||||||
|
return HttpResponseRedirect(
|
||||||
|
reverse("auth_login") + "?next=" + urlquote(request.path)
|
||||||
|
)
|
||||||
except ObjectDoesNotExist:
|
except ObjectDoesNotExist:
|
||||||
pass
|
pass
|
||||||
return self.get_response(request)
|
return self.get_response(request)
|
||||||
|
|
Loading…
Add table
Reference in a new issue