diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-19 11:12:30 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-19 11:12:30 +0100 |
| commit | 7dc21de29939458f94f78c00c99c9c1403d694d1 (patch) | |
| tree | 61e0d14ae58c50c7684a30c8fe328c3faeebb6f0 | |
| parent | 9d6870fa61b2bfd5367d58ff7a2ea0e7828a3d55 (diff) | |
| parent | d2f705ef0d03a7ace25c78152bf5d7a3d85fa914 (diff) | |
| download | Chimère-7dc21de29939458f94f78c00c99c9c1403d694d1.tar.bz2 Chimère-7dc21de29939458f94f78c00c99c9c1403d694d1.zip | |
Merge branch 'master' into v2.0
| -rw-r--r-- | chimere/models.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chimere/models.py b/chimere/models.py index c3d4733..0fc22ee 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -521,11 +521,14 @@ class Marker(GeographicItem): def default_category(self): # Should we select only available ones ? # Should we catch if not exists ? - return self.categories.all()[0] + cats = self.categories + if cats.count(): + return cats.all()[0] def get_absolute_url(self, area_name=''): - parameters = 'current_feature=%d&checked_categories=%s' % (self.id, - self.default_category.pk) + parameters = 'current_feature=%d' % self.id + if self.default_category: + parameters += '&checked_categories=%s' % self.default_category.pk urn = TinyUrl.getUrnByParameters(parameters) area_name = area_name + '/' if area_name else '' url = reverse('chimere:tiny', args=[area_name, urn]) |