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 (file)
index 95e99e4..0000000
--- 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 2077d4f264865db61b73e95e859c9819b1d68041..7ccb3974d222da34463d18c62bdaaf5bfcdf2f52 100644 (file)
--- 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 bfd9b7ae5438ab81d8f2556a239c64c8c316c683..4e94150a4a7926aeac88d65e22b5ec209c452cab 100644 (file)
--- 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 }}