summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-01 18:56:55 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-01 18:56:55 +0200
commit862f795c2a2067510d10fdabdaec7c2e491a78ed (patch)
tree4ff776593245faf3352bfcf4af35477344093e73 /chimere/models.py
parent7ddf224de3f1f751f00ebc883404f1424f018c3e (diff)
downloadChimère-862f795c2a2067510d10fdabdaec7c2e491a78ed.tar.bz2
Chimère-862f795c2a2067510d10fdabdaec7c2e491a78ed.zip
Manage agregation on higher zoom
* json give the needed zoom to have full access on objects * js reload items when the needed zoom is reach * on click on aggregated item zoom to the needed zoom to have access to items
Diffstat (limited to 'chimere/models.py')
-rw-r--r--chimere/models.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/chimere/models.py b/chimere/models.py
index 9f3734d..2f6999e 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -291,7 +291,8 @@ class SubCategory(models.Model):
return u"%s / %s" % (self.category.name, self.name)
@classmethod
- def getAvailable(cls, item_types=None, area_name=None, public=False):
+ def getAvailable(cls, item_types=None, area_name=None, public=False,
+ instance=False):
'''Get list of tuples with first the category and second the associated
subcategories
'''
@@ -312,6 +313,10 @@ class SubCategory(models.Model):
subcategories = subcategories.filter(id__in=sub_ids)
selected_cats = [subcat.pk
for subcat in area.default_subcategories.all()]
+
+ if instance:
+ return subcategories.order_by('order')
+
for sub_category in subcategories.order_by('order'):
if sub_category.category not in sub_categories:
sub_categories[sub_category.category] = []
@@ -319,7 +324,6 @@ class SubCategory(models.Model):
sub_category.selected = True
sub_category.category.selected = True
sub_categories[sub_category.category].append(sub_category)
-
subcategories = [(cat, subcats)
for cat, subcats in sub_categories.items()]
get_cat_order = lambda cat_tuple: cat_tuple[0].order