diff options
| -rw-r--r-- | chimere/models.py | 4 | ||||
| -rw-r--r-- | chimere/views.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/chimere/models.py b/chimere/models.py index de365de..c1b47d3 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -312,7 +312,7 @@ class SubCategory(models.Model): return "%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, submission=False, instance=False, area=None): """ Get list of tuples with first the category and second the associated @@ -324,7 +324,7 @@ class SubCategory(models.Model): subcategories = subcategories.filter(available=True) else: subcategories = subcategories.filter(item_type__in=item_types) - if public: + if submission: subcategories = subcategories.filter(submission=True) selected_cats = [] if area_name: diff --git a/chimere/views.py b/chimere/views.py index 84e5e03..d260a65 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -256,7 +256,7 @@ def get_edit_page(redirect_url, item_cls, item_form, if 'area_name' in response_dct: area_name = response_dct['area_name'] subcategories = models.SubCategory.getAvailable(cat_type, area_name, - public=True) + submission=True) listed_subcats = [] if subcategories: for cat, subcats in subcategories: @@ -686,8 +686,7 @@ def _getGeoObjects(area_name, category_ids, status='A', getjson=True, items = [] empty = [] if not getjson else {} subcategories = list( - models.SubCategory.getAvailable(None, area_name, public=True, - instance=True).all()) + models.SubCategory.getAvailable(None, area_name, instance=True).all()) aggregated_category_ids = [] try: zoom_level = int(zoom_level) @@ -704,7 +703,6 @@ def _getGeoObjects(area_name, category_ids, status='A', getjson=True, zoom_need_reload = subcat.min_zoom aggregated_category_ids.append( subcategories.pop(len_subcats - 1 - idx).pk) - category_ids = [ subcat.pk for subcat in subcategories if str(subcat.pk) in category_ids] |