Admin: fix property initialization for markers and routes

1 files changed, 13 insertions, 8 deletions

diff --git a/chimere/forms.py b/chimere/forms.py
index 63aadf9..6cc1aba 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -325,10 +325,13 @@ class MarkerAdminFormBase(forms.ModelForm):
         area_name = None
         if 'area_name' in keys:
             area_name = keys.pop('area_name')
-        querys = PropertyModel.getAvailable(area_name=area_name)
         self.pms = []
-        for query in querys:
-            self.pms += [pm for pm in query.all()]
+        if self.is_admin:
+            self.pms = list(PropertyModel.objects.all())
+        else:
+            querys = PropertyModel.getAvailable(area_name=area_name)
+            for query in querys:
+                self.pms += [pm for pm in query.all()]
         if 'instance' in keys and keys['instance']:
             instance = keys['instance']
             property_dct = {}
@@ -355,7 +358,7 @@ class MarkerAdminFormBase(forms.ModelForm):
         choices = list(self.fields['categories'].choices)
         self.fields['categories'].choices = choices
         self.fields['categories'].label = ""
-        if (len(choices) == 1):
+        if len(choices) == 1:
             self.fields['categories'].widget = forms.MultipleHiddenInput()
             choices = list(self.fields['categories'].choices)
             if type(choices[0][1]) in (list, tuple):
@@ -488,10 +491,12 @@ class RouteAdminForm(forms.ModelForm):
         area_name = None
         if 'area_name' in keys:
             area_name = keys.pop('area_name')
-        querys = PropertyModel.getAvailable(area_name=area_name)
-        self.pms = []
-        for query in querys:
-            self.pms += [pm for pm in query.all()]
+        if self.is_admin:
+            self.pms = list(PropertyModel.objects.all())
+        else:
+            querys = PropertyModel.getAvailable(area_name=area_name)
+            for query in querys:
+                self.pms += [pm for pm in query.all()]
         if 'instance' in keys and keys['instance']:
             instance = keys['instance']
             property_dct = {}