innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #634 -- Changed shortcut view to accept get_absolute_url()s that return URLs starting with http. Thanks, Hugo 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-10-17 13:24:29 +00:00
parent 0bb68cd072
commit 383704ac84
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/views/defaults.py
View File

@ -10,8 +10,12 @@ def shortcut(request, content_type_id, object_id):
obj = content_type.get_object_for_this_type(pk=object_id) obj = content_type.get_object_for_this_type(pk=object_id)
except ObjectDoesNotExist: except ObjectDoesNotExist:
raise Http404, "Content type %s object %s doesn't exist" % (content_type_id, object_id) raise Http404, "Content type %s object %s doesn't exist" % (content_type_id, object_id)
if not hasattr(obj, 'get_absolute_url'): try:
absurl = obj.get_absolute_url()
except AttributeError:
raise Http404, "%s objects don't have get_absolute_url() methods" % content_type.name raise Http404, "%s objects don't have get_absolute_url() methods" % content_type.name
if absurl.startswith('http://'):
return httpwrappers.HttpResponseRedirect(absurl)
object_domain = None object_domain = None
if hasattr(obj, 'get_site_list'): if hasattr(obj, 'get_site_list'):
site_list = obj.get_site_list() site_list = obj.get_site_list()
@ -27,8 +31,8 @@ def shortcut(request, content_type_id, object_id):
except sites.SiteDoesNotExist: except sites.SiteDoesNotExist:
pass pass
if not object_domain: if not object_domain:
return httpwrappers.HttpResponseRedirect(obj.get_absolute_url()) return httpwrappers.HttpResponseRedirect(absurl)
return httpwrappers.HttpResponseRedirect('http://%s%s' % (object_domain, obj.get_absolute_url())) return httpwrappers.HttpResponseRedirect('http://%s%s' % (object_domain, absurl))
def page_not_found(request): def page_not_found(request):
""" """