From 5889915d68867862c2f37866e8f8bf949c01e06e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 28 Oct 2013 19:31:45 +0100 Subject: Templates: list all dependant documents New template tags for displaying table of documents --- archaeological_context_records/models.py | 12 ++++++++++ .../templates/ishtar/sheet_contextrecord.html | 26 +++++----------------- 2 files changed, 18 insertions(+), 20 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 0a970b8ce..b33b86e8c 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -19,6 +19,7 @@ from django.conf import settings from django.contrib.gis.db import models +from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _, ugettext, pgettext from ishtar_common.models import GeneralType, BaseHistorizedItem, \ @@ -157,6 +158,10 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): return settings.JOINT.join([unicode(item) for item in [self.parcel, self.label] if item]) + @property + def show_url(self): + return reverse('show-contextrecord', args=[self.pk, '']) + def full_label(self): if not self.operation: return unicode(self) @@ -218,6 +223,10 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): def get_total_number(cls): return cls.objects.filter(operation__start_date__isnull=False).count() + def find_docs_q(self): + from archaeological_finds.models import FindSource + return FindSource.objects.filter(find__base_finds__context_record=self) + class ContextRecordSource(Source): class Meta: verbose_name = _(u"Context record documentation") @@ -225,3 +234,6 @@ class ContextRecordSource(Source): context_record = models.ForeignKey(ContextRecord, verbose_name=_(u"Context record"), related_name="source") + @property + def owner(self): + return self.context_record diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 741201daa..4284b7eef 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -1,5 +1,5 @@ {% extends "ishtar/sheet.html" %} -{% load i18n %} +{% load i18n window_tables %} {% block head_sheet %} {{block.super}} @@ -92,25 +92,8 @@ {% else %}

{% endif %} - - - - - - - - - {% for doc in item.source.all %} - - - - - - - {% empty %} - - {% endfor %} -
{%trans "Documents"%}
{% trans "Title" %}{% trans "Type" %}{% trans "Authors" %}{% trans "Link" %}
{{ doc.title }}{{doc.source_type}}{{ doc.authors.all|join:", " }}{% if doc.associated_url %}{% trans "Link"%}{% endif %}
{% trans "No document associated to this context record" %}
+{% trans "Document from this context record" as cr_docs %} +{% if item.source.count %} {% table_document cr_docs item.source.all %}{% endif %} @@ -151,4 +134,7 @@ {% endfor %}
{%trans "Finds"%}
+{% trans "Documents from associated finds" as find_docs %} +{% if item.find_docs_q.count %} {% table_document find_docs item.find_docs_q.all %}{% endif %} + {% endblock %} -- cgit v1.2.3