diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-20 11:46:14 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-20 11:46:14 +0100 |
| commit | 4552da64e3da96a17af2b31c91df2cd458c2c564 (patch) | |
| tree | 59add568af7a10b2725fb20ae6970a1b29610df1 | |
| parent | c990ea7c38eaed78ec11842c236d440eda292f1e (diff) | |
| download | Chimère-4552da64e3da96a17af2b31c91df2cd458c2c564.tar.bz2 Chimère-4552da64e3da96a17af2b31c91df2cd458c2c564.zip | |
Fix search result template to manage new ids
| -rw-r--r-- | chimere/models.py | 8 | ||||
| -rw-r--r-- | chimere/templates/search/search.html | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/chimere/models.py b/chimere/models.py index 2d5c991..72aee74 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -620,6 +620,14 @@ class GeographicItem(models.Model): setattr(self, attr_name + '_set', property_setter(self.__class__, pm)) + @property + def full_id(self): + """ + Get the full ID: "object type-primary key". For instance: "marker-1234" + :return: full id of the object (string) + """ + return "{}-{}".format(str(self.__class__.__name__).lower(), self.pk) + def get_geometry(self): return getattr(self, self.geom_attr) diff --git a/chimere/templates/search/search.html b/chimere/templates/search/search.html index ab3e61e..ea679c2 100644 --- a/chimere/templates/search/search.html +++ b/chimere/templates/search/search.html @@ -9,7 +9,7 @@ var end_do_you_mean = "{% trans '?' %}"; <ul> {% for result in page.object_list %} <li> - <img src='{{MEDIA_URL}}{{result.object.default_category.icon.image}}'/><a href="#" onclick="$('#main-map').chimere('showPopup', {{result.object.pk}});return false;">{{ result.object }}</a> + <img src='{{MEDIA_URL}}{{result.object.default_category.icon.image}}'/><a href="#" onclick="$('#main-map').chimere('showPopup', '{{result.object.full_id}}');return false;">{{ result.object }}</a> </li> {% empty %} <li>{% trans "No results found." %}</li> |