Changeset 9674 for src/django_gheat/wlheatmap

Timestamp:

Sep 7, 2011, 8:06:09 PM (13 years ago)

Author:

rick

Message:

• Yield error on form failure.

-the set is only done ones, while function get evaluated every time.

File:

• src/django_gheat/wlheatmap/__init__.py (modified) (2 diffs)

src/django_gheat/wlheatmap/__init__.py

@@ -39 +39 @@
 from django.core.files.base import ContentFile
 
+def get_apperatuur_choices(item):
+  return sorted(set(Apparatuur.objects.values_list(item,item)))
+
 class MeetBestandForm(forms.Form):
     naam = forms.ChoiceField(choices=Gebruiker.objects.values_list('naam','naam'))
-    kaart = forms.ChoiceField(choices=set(Apparatuur.objects.values_list('kaart','kaart')))
-    antenne = forms.ChoiceField(choices=set(Apparatuur.objects.values_list('antenne','antenne')))
+    kaart = forms.ChoiceField(choices=get_apperatuur_choices('kaart'))
+    antenne = forms.ChoiceField(choices=get_apperatuur_choices('antenne'))
     bestand = forms.FileField()
 
@@ -66 +69 @@
       else:
         return HttpResponseServerError('ERROR File does already exists')
-        
+    else:
+      return HttpResponseServerError('ERROR No valid input')
   else:
     form = MeetBestandForm()