summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorLoic Bistuer <loic.bistuer@sixmedia.com>2013-11-21 16:26:49 +0700
committerLoic Bistuer <loic.bistuer@sixmedia.com>2013-11-21 16:26:49 +0700
commit8e670a0e503ae11941bb6ba0e70e0e579286d362 (patch)
tree5479453a73e2239bee0502f8aef465b3e5ce2c6e /django
parentfafb6cf049bb9f4591a8b94cffda12c081cd096f (diff)
Refs #8261 -- Fixed regression introduced by fd219fa.
ModelAdmin displayed the "View on site" link even if the Model didn't define the `get_absolute_url()` method.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/options.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 6ab842dd61..48b93166c8 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -250,7 +250,7 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)):
if callable(self.view_on_site):
return self.view_on_site(obj)
- elif self.view_on_site:
+ elif self.view_on_site and hasattr(obj, 'get_absolute_url'):
# use the ContentType lookup if view_on_site is True
return reverse('admin:view_on_site', kwargs={
'content_type_id': ContentType.objects.get_for_model(obj).pk,