summaryrefslogtreecommitdiff
path: root/chimere/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-02-27 12:39:03 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-02-27 12:39:03 +0100
commit2ca084384e6bf0596822938a607a189b507f60ed (patch)
tree16db66e2f72e070b7c3ed5e20b991a6356d02d8b /chimere/views.py
parent1da288964f2d2279339fd9224bd31831526f6e4d (diff)
parenteff2dd6938980317015bfba3e34a31aa8139e335 (diff)
downloadChimère-2ca084384e6bf0596822938a607a189b507f60ed.tar.bz2
Chimère-2ca084384e6bf0596822938a607a189b507f60ed.zip
Merge branch 'v2.2'
Diffstat (limited to 'chimere/views.py')
-rw-r--r--chimere/views.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/views.py b/chimere/views.py
index 4ca2498..be9d816 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -755,7 +755,7 @@ def get_available_categories(request, map_name=None, map=None, status='A',
if not categories:
return HttpResponse(default_message)
get_cat = lambda subcat: subcat.category
- get_cat_order = lambda subcat: (subcat.category.order, subcat.category,
+ get_cat_order = lambda subcat: (subcat.category.order, subcat.category.pk,
subcat.order)
categories = sorted(categories, key=get_cat_order)
subcategories = [(cat, list(subcats)) \