* Remove LooseModelChoiceField

 * Use ModelChoiceField

 * use empty_label='none'
 - Legacy-Id: 957

Author: Michael Lee

ietf/mailinglists/forms.py

@@ -223,34 +223,4 @@ def clean(self, value):
 class ApprovalComment(forms.Form):
     add_comment = forms.CharField(label="Approver's comments to the requestor (will be emailed to the requestor)", widget=forms.Textarea(attrs={'cols':41, 'rows': 4}))
 
-class LooseModelChoiceField (ModelChoiceField) :
-    def __init__(self, queryset, empty_label=u"---------", cache_choices=False,
-        required=True, widget=forms.Select, label=None, initial=None,
-        help_text=None):
-
-        super(LooseModelChoiceField, self).__init__(queryset, empty_label, cache_choices, required, widget, label, initial, help_text)
-
-    def _get_choices(self):
-        return [i for i in super(LooseModelChoiceField, self)._get_choices()] + [("none", "none", )]
-
-    def _set_choices (self, value) :
-        return super(LooseModelChoiceField, self)._set_choices(value)
-
-    choices = property(_get_choices, _set_choices)
-
-    def clean(self, value):
-        Field.clean(self, value)
-        if value in ('', None):
-            return None
-
-        if value == "none" :
-                return value
-
-        try:
-            value = self.queryset.model._default_manager.get(pk=value)
-        except self.queryset.model.DoesNotExist:
-            raise ValidationError(gettext(u'Select a valid choice. That choice is not one of the available choices.'))
-        return value
-
-
 

ietf/mailinglists/views.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from forms import NonWgStep1, ListReqStep1, PickApprover, DeletionPickApprover, UrlMultiWidget, Preview, ListReqAuthorized, ListReqClose, MultiEmailField, AdminRequestor, ApprovalComment, ListApprover, LooseModelChoiceField
+from forms import NonWgStep1, ListReqStep1, PickApprover, DeletionPickApprover, UrlMultiWidget, Preview, ListReqAuthorized, ListReqClose, MultiEmailField, AdminRequestor, ApprovalComment, ListApprover
 from models import NonWgMailingList, MailingList, Domain
 from ietf.idtracker.models import Area, PersonOrOrgInfo, AreaDirector, WGChair, Role
 from django import newforms as forms
@@ -13,10 +13,10 @@
 from datetime import datetime
 
 def get_approvers_from_area (area_id) :
-    if area_id == "none" :
-        return [ad.person_id for ad in Role.objects.filter(role_name__in=("IETF", "IAB", ))]
-    else :
-        return [ad.person_id for ad in Area.objects.get(area_acronym=area_id).areadirector_set.all()]
+        if not area_id :
+                return [ad.person_id for ad in Role.objects.filter(role_name__in=("IETF", "IAB", ))]
+        else :
+                return [ad.person_id for ad in Area.objects.get(area_acronym=area_id).areadirector_set.all()]
 
 def formchoice(form, field):
     if not(form.is_valid()):
@@ -105,19 +105,19 @@ def process_step(self, request, form, step):
 	if step == 0:
 	    self.clean_forms = [ form ]
 	    if form.clean_data['add_edit'] == 'add':
-                nonwg_fields["area"] = LooseModelChoiceField(Area.objects.filter(status=1))
+                nonwg_fields["area"] = forms.ModelChoiceField(Area.objects.filter(status=1), required=False, empty_label='none')
                 nonwg_callback = form_decorator(fields=nonwg_fields, widgets=nonwg_widgets, attrs=nonwg_attrs, querysets=nonwg_querysets)
 
 		self.form_list.append(forms.form_for_model(NonWgMailingList, formfield_callback=nonwg_callback))
 	    elif form.clean_data['add_edit'] == 'edit':
                 list = NonWgMailingList.objects.get(pk=form.clean_data['list_id'])
-                nonwg_fields["area"] = LooseModelChoiceField(Area.objects.filter(status=1), initial=list.area_id is None and "none" or list.area_id)
+                nonwg_fields["area"] = forms.ModelChoiceField(Area.objects.filter(status=1), required=False, empty_label='none',initial=list.area_id is None or list.area_id)
                 nonwg_callback = form_decorator(fields=nonwg_fields, widgets=nonwg_widgets, attrs=nonwg_attrs, querysets=nonwg_querysets)
 
 		self.form_list.append(forms.form_for_instance(list, formfield_callback=nonwg_callback))
 	    elif form.clean_data['add_edit'] == 'delete':
 		list = NonWgMailingList.objects.get(pk=form.clean_data['list_id_delete'])
-		self.form_list.append(gen_approval(get_approvers_from_area(list.area is None and "none" or list.area_id), DeletionPickApprover))
+		self.form_list.append(gen_approval(get_approvers_from_area(list.area is None or list.area_id), DeletionPickApprover))
 		self.form_list.append(Preview)
 	else:
 	    self.clean_forms.append(form)
@@ -135,7 +135,7 @@ def done(self, request, form_list):
 	if add_edit == 'add' or add_edit == 'edit':
 	    template = 'mailinglists/nwg_addedit_email.txt'
 	    approver = self.clean_forms[2].clean_data['approver']
-	    if self.clean_forms[1].clean_data["area"] == "none" :
+	    if not self.clean_forms[1].clean_data["area"] :
 	        self.clean_forms[1].clean_data["area"] = None
 
 	    list = NonWgMailingList(**self.clean_forms[1].clean_data)