From: Kaltar5679 <killian.mary@outlook.fr>
Date: Thu, 23 Apr 2015 09:41:04 +0000 (+0200)
Subject: Print location in haystack search
X-Git-Tag: 1.6a^2~15^2~88^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a47fb733f6e985c2e475eb8bf539a005696f13a6;p=telemeta.git

Print location in haystack search
del mediaitem_rec_date.txt because unused
---

diff --git a/telemeta/templates/search/indexes/telemeta/mediaitem_rec_date.txt b/telemeta/templates/search/indexes/telemeta/mediaitem_rec_date.txt
deleted file mode 100644
index 95e99e43..00000000
--- a/telemeta/templates/search/indexes/telemeta/mediaitem_rec_date.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-{{ object.recorded_from_date }}
-{{ object.recorded_to_date }}
-
diff --git a/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt b/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt
index 2077d4f2..7ccb3974 100644
--- a/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt
+++ b/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt
@@ -5,6 +5,7 @@
 {{ object.code }}
 {{ object.old_code }}
 {{ object.location }}
+{{ object.location.name }}
 {{ object.comment }}
 {{ object.external_references }}
 {{ object.location_comment }}
diff --git a/telemeta/templates/search/mediaitem_listhaystack.html b/telemeta/templates/search/mediaitem_listhaystack.html
index bfd9b7ae..4e94150a 100644
--- a/telemeta/templates/search/mediaitem_listhaystack.html
+++ b/telemeta/templates/search/mediaitem_listhaystack.html
@@ -37,11 +37,7 @@
     </td>
 
     <td>{{ result.object.collector }}</td>
-    {% if location_name %}
     <td>{{ result.object.location.name }}</td>
-    {% else %}
-    <td>{{ result.object.country_or_continent|default:'&nbsp;' }}</td>
-    {% endif %}
     <td>
     {% if result.object.recorded_from_date %}
         {{ result.object.recorded_from_date.year }}