Merged in [9519] from rcross@amsl.com:

Fixes issue #1676.

    Fixes #1676.  RelatedObjectDoesNotExist when User has no Person.
 - Legacy-Id: 9538
Note: SVN reference [9519] has been migrated to Git commit 80d6564458
This commit is contained in:
Henrik Levkowetz 2015-04-21 20:17:39 +00:00
commit d30981ddbd
2 changed files with 7 additions and 2 deletions

View file

@ -2,6 +2,7 @@ from functools import wraps
from django.conf import settings
from django.contrib.auth import REDIRECT_FIELD_NAME
from django.core.exceptions import ObjectDoesNotExist
from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.shortcuts import render_to_response, get_object_or_404
from django.utils.http import urlquote
@ -65,7 +66,11 @@ def check_permissions(func):
session = slide.session_set.all()[0]
group = session.group
login = request.user.person
try:
login = request.user.person
except ObjectDoesNotExist:
return HttpResponseForbidden("User not authorized to access group: %s" % group.acronym)
groups = [group]
if group.parent:
groups.append(group.parent)

View file

@ -7,7 +7,7 @@
# --- Add entries at the top ---
personal/lars/6.0.2.dev0@9526
personal/lars/6.0.2.dev0@9523:9526
personal/willem/v5.12.4.dev0@9316
branch/iola/facelift-r8876@8970 Test crawler speed-up
branch/iola/facelift-r8510@8733