Fix property model filtering on edit pages

1 files changed, 12 insertions, 6 deletions

diff --git a/chimere/views.py b/chimere/views.py
index 9281e8d..9c9de11 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -344,9 +344,12 @@ def edit(request, area_name="", item_id=None, submited=False):
     item_id, init_item, response_dct, form, formset_multi, formset_picture = \
         values
     # get the "manualy" declared_fields. Ie: properties
-    declared_fields = PropertyModel.getAvailable(area_name=area_name)
-    filtered_properties = declared_fields.filter(
-        subcategories__id__isnull=False).all()
+    querys = PropertyModel.getAvailable(area_name=area_name)
+    declared_fields, filtered_properties = [], []
+    for query in querys:
+        declared_fields += query.all()
+        filtered_properties += query.filter(
+            subcategories__id__isnull=False).all()
     point_value = init_item.point if init_item else None
     if request.POST and request.POST.get('point'):
         point_value = request.POST.get('point')
@@ -501,9 +504,12 @@ def editPolygon(request, area_name="", item_id=None, submited=False):
         values
 
     # get the "manualy" declared_fields. Ie: properties
-    declared_fields = PropertyModel.getAvailable(area_name=area_name)
-    filtered_properties = declared_fields.filter(
-        subcategories__id__isnull=False).all()
+    querys = PropertyModel.getAvailable(area_name=area_name)
+    declared_fields, filtered_properties = [], []
+    for query in querys:
+        declared_fields += query.all()
+        filtered_properties += query.filter(
+            subcategories__id__isnull=False).all()
     polygon_value = init_item.polygon if init_item else None
     if request.POST and request.POST.get('polygon'):
         polygon_value = request.POST.get('polygon')