# HG changeset patch # User durandn # Date 1471510620 -7200 # Node ID 81d82b1f431a367f45c1d56d045f926f34c03084 # Parent 8de104e8f3ad1fd573a36685f90b647819212c51 generating joconde external url + small change on comment submit button + small change on __str__ for metacategories diff -r 8de104e8f3ad -r 81d82b1f431a src/iconolab/models.py --- a/src/iconolab/models.py Wed Aug 17 16:46:20 2016 +0200 +++ b/src/iconolab/models.py Thu Aug 18 10:57:00 2016 +0200 @@ -68,7 +68,7 @@ @property def get_joconde_url(self): - return self.joconde_ref + return settings.JOCONDE_NOTICE_BASE_URL+self.joconde_ref.rjust(11, '0') def __str__(self): return "metadatas:for:"+str(self.item.item_guid) @@ -496,7 +496,7 @@ triggers_notifications = models.IntegerField(choices=NOTIFIED_USERS, default=NONE) def __str__(self): - return self.label+":from:"+self.collection.name + return self.label class MetaCategoryInfo(models.Model): diff -r 8de104e8f3ad -r 81d82b1f431a src/iconolab/settings/dev.py.tmpl --- a/src/iconolab/settings/dev.py.tmpl Wed Aug 17 16:46:20 2016 +0200 +++ b/src/iconolab/settings/dev.py.tmpl Thu Aug 18 10:57:00 2016 +0200 @@ -219,4 +219,26 @@ USE_TZ = True + +IMPORT_FIELDS_DICT = { + "AUTR": [], + "ECOLE": [], + "TITR": ["Titre"], + "DENO": [], + "APPL": [], + "PERI": ["Période"], + "MILL": [], + "EPOCH": [], + "TECH": [], + "DIMS": ["Dimensions"], + "EPOCH": [], + "LIEUX": [], + "DECV": [], + "LOCA": ["Localisation"], + "PHOT": ["Photo"], + "INV": ["No inventaire",], + "REF": ["REFERENCE"], +} + INTERNAL_TAGS_URL = BASE_URL +JOCONDE_NOTICE_BASE_URL = "http://www.culture.gouv.fr/public/mistral/joconde_fr?ACTION=CHERCHER&FIELD_98=REF&VALUE_98=" diff -r 8de104e8f3ad -r 81d82b1f431a src/iconolab/templates/iconolab/detail_annotation.html --- a/src/iconolab/templates/iconolab/detail_annotation.html Wed Aug 17 16:46:20 2016 +0200 +++ b/src/iconolab/templates/iconolab/detail_annotation.html Thu Aug 18 10:57:00 2016 +0200 @@ -219,7 +219,7 @@

- +

{% endif %} diff -r 8de104e8f3ad -r 81d82b1f431a src/iconolab/templates/iconolab/detail_item.html --- a/src/iconolab/templates/iconolab/detail_item.html Wed Aug 17 16:46:20 2016 +0200 +++ b/src/iconolab/templates/iconolab/detail_item.html Thu Aug 18 10:57:00 2016 +0200 @@ -31,7 +31,7 @@ {% if item.metadatas.discovery_context %}
Contexte de découverte: {{item.metadatas.discovery_context}}
{% endif %} {% if item.metadatas.photo_credits %}
Crédits photographique: {{item.metadatas.photo_credits}}
{% endif %} {% if item.metadatas.inventory_number %}
Numéro d'inventaire: {{item.metadatas.inventory_number}}
{% endif %} - {% if item.metadatas.joconde_ref %}
Cet objet dans Joconde {{item.metadatas.get_joconde_url}}
{% endif %} + {% if item.metadatas.joconde_ref %}
Cet objet dans Joconde
{% endif %}
{% if item.images.all.count > 1 %}

Autres images pour cet objet: