diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-13 13:54:25 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-13 14:01:49 +0100 |
| commit | dd96596c0c7ea22c7b4c637e8a53401d1c79cea2 (patch) | |
| tree | c45999a94fe8f25d40385a2665620c04a7bd2b8e /archaeological_files | |
| parent | e46c9bf152d11a77207985a2a2d5b781ab48c49e (diff) | |
| download | Ishtar-dd96596c0c7ea22c7b4c637e8a53401d1c79cea2.tar.bz2 Ishtar-dd96596c0c7ea22c7b4c637e8a53401d1c79cea2.zip | |
Sheets: add ishtar ID (refs #3517)
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/models.py | 5 | ||||
| -rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 27 |
2 files changed, 12 insertions, 20 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index c8134f28f..7f37a298f 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -236,6 +236,11 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, return _(u"FILE") @property + def full_internal_ref(self): + return u"{}{}".format(settings.ISHTAR_FILE_PREFIX or '', + self.external_id or '') + + @property def delay_date(self): cache_key, val = get_cache(self.__class__, [self.pk, 'delay_date']) if val: diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 408edde34..bfd92eb6f 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -11,29 +11,16 @@ {% window_nav item window_id 'show-file' 'file_modify' 'show-historized-file' 'revert-file' previous next 1 %} {% endif %} +<p class='window-refs'>{{item.full_internal_ref|default:''}}</p> +<p class='window-refs'>{{item.internal_reference|default:''}}</p> +<p class='window-refs'>{{item.name|default:''}}</p> +{% include "ishtar/blocks/sheet_external_id.html" %} + <h3>{% trans "General"%}</h3> <ul class='form-flex'> -{% field_li "Year" item.year "<strong>" "</strong>" %} -{% field_li "Numerical reference" item.numeric_reference "<strong>" "</strong>" %} -{% field_li "Other reference" item.internal_reference %} -{% field_li "Name" item.name %} - {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %} - - <li><label>{%trans "Creation:"%}</label> - <span class='value'> - {{item.history_creator.ishtaruser.person}}<br/> - <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small> - </span> - </li> - {% if item.history_creation_date != item.last_edition_date %} - <li><label>{%trans "Modification:"%}</label> - <span class='value'> - {{item.history_modifier.ishtaruser.person}}<br/> - <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small> - </span> - </li> - {% endif %} + {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %} + {% include "ishtar/blocks/sheet_creation_section.html" %} {% comment %} |