From 8dccaabb0cfba95d618bd6231371dd7466ea241b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 25 Feb 2019 18:32:17 +0100 Subject: Absolute url is display-item url --- archaeological_context_records/urls.py | 2 -- archaeological_context_records/views.py | 1 - ishtar_common/models.py | 6 ++++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 175c87482..fc917f542 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -53,8 +53,6 @@ urlpatterns = [ views.show_contextrecord, name='show-historized-contextrecord'), url(r'revert-contextrecord/(?P.+)/(?P.+)$', views.revert_contextrecord, name='revert-contextrecord'), - url(r'^display-contextrecord/(?P.+)/$', views.display_contextrecord, - name='display-' + models.ContextRecord.SLUG), url(r'generate-relation-image-contextrecord/(?P.+)/', views.GenerateRelationImage.as_view(), name='generate-relation-image-contextrecord'), diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index ae07c4037..55cacaf5d 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -44,7 +44,6 @@ show_contextrecord = show_item( extra_dct=site_extra_context ) revert_contextrecord = revert_item(models.ContextRecord) -display_contextrecord = display_item(models.ContextRecord) def autocomplete_contextrecord(request): diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 5e81e80a0..9b5185be4 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1945,6 +1945,12 @@ class BaseHistorizedItem(DocumentItem, FullSearch, Imported, JsonData, values[k] = getattr(self, k) return values + def get_absolute_url(self): + try: + return reverse('display-item', args=[self.SLUG, self.pk]) + except NoReverseMatch: + return + def get_show_url(self): show_url = self.SHOW_URL if not show_url: -- cgit v1.2.3