From dd56fe1fa918f219c324cb164f83ee0000f4da7c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 17 Dec 2013 20:22:39 +0100 Subject: [PATCH] display doctype_code if not null or 0 --- telemeta/models/media.py | 2 +- telemeta/templates/telemeta/collection_detail.html | 4 +++- telemeta/templates/telemeta/collection_edit.html | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 0d9740c9..811d60be 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -209,7 +209,7 @@ class MediaCollection(MediaResource): publisher_serial = CharField(_('publisher serial number')) booklet_author = CharField(_('author of published notice')) external_references = TextField(_('bibliographic references')) - doctype_code = IntegerField(_('document type')) + doctype_code = IntegerField(_('document type'), null=True, blank=True) public_access = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata") legal_rights = WeakForeignKey('LegalRight', related_name="collections", diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html index 5f6aee15..740d57a1 100644 --- a/telemeta/templates/telemeta/collection_detail.html +++ b/telemeta/templates/telemeta/collection_detail.html @@ -137,7 +137,9 @@ {% dl_field collection "booklet_author" %}
{% trans "Bibliographic references" %}
{{ collection.external_references|html_line_break|safe }}
- {% dl_field collection "doctype_code" %} + {% if collection.doctype_code %} + {% dl_field collection "doctype_code" %} + {% endif %} {% dl_field collection "public_access_label" %} {% dl_field collection "legal_rights" %} diff --git a/telemeta/templates/telemeta/collection_edit.html b/telemeta/templates/telemeta/collection_edit.html index 7d3ec6bd..af931f6d 100644 --- a/telemeta/templates/telemeta/collection_edit.html +++ b/telemeta/templates/telemeta/collection_edit.html @@ -18,7 +18,7 @@ {% for error in form.non_field_errors %}
  • {{ error }}
  • {% endfor %} {% for field in form %} - {% if field.html_name == "copied_from_item" or field.html_name == "doctype_code" %} + {% if field.html_name == "copied_from_item" %} {{ field.label_tag.as_hidden }}{{ field.as_hidden }} {% else %} {{ field.errors }} -- 2.39.5