To enable to select 'none' area in wizard page of none-wg-mailinglists without any

modification of TABLE 'Area'(see Bill's comment in ticket:205), I add the classes in
mailinglists module.

    * ietf/settings.py 

At first, add CONSTANT, CODE_AREA in ietf/mailinglists/__init__.py for global access.

CODE_AREA = {
        "none" : "-100",
}

To keep the code stability of 'area_acronym_id' in TABLE 'none_wg_mailing_list',
CODE_AREAOther? assigned -100.

    * ietf/mailinglists/forms.py 

        add 'SelectWidgetArea', it just add psuedo choice in 'area' select input box.

    * ietf/mailinglists/models.py 

        add new ForeignKey type 'ForeignKeyArea' to keep the existing deep form-model
relations, so this new field type handles normal area value and 'none'.

        The class, 'NonWgMailingList' has some changes. To prevent 'DoesNotExist'
Exception when fetching the real acronym from 'Acronym', add setattr method. It stores
'none' area value in /* cache */ and return it.

    * ietf/mailinglists/views.py 

        In the last step of update wizard, split the routine to check whether the area
code is 'none' or not. If 'none', the approval persons is fetched from 'Role'(TABLE
'chairs').

There is changes only in 'mailinglists' module, so I guess this works.
 - Legacy-Id: 952

Author: spikeekips

ietf/mailinglists/__init__.py

@@ -1,2 +1,7 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
+# for area code for Non-WG-Mailinglists
+CODE_AREA = {
+        "none" : "-100",
+}
+

ietf/mailinglists/forms.py

@@ -3,6 +3,7 @@
 from django import newforms as forms
 from models import NonWgMailingList, ImportedMailingList
 from ietf.idtracker.models import PersonOrOrgInfo, IETFWG
+from ietf.mailinglists import CODE_AREA
 import re
 
 class NonWgStep1(forms.Form):
@@ -220,3 +221,12 @@ 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 SelectWidgetArea (forms.Select) :
+        def render(self, name, value, attrs=None, choices=()) :
+                choices = ((CODE_AREA["none"], "none", ), )
+                return super(SelectWidgetArea, self).render(name, value, attrs, choices)
+
+
+

ietf/mailinglists/models.py

@@ -1,8 +1,16 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 from django.db import models
+from django.db.models.fields.related import ManyToOneRel
+from django import newforms as forms
+from django.newforms import Field, util
+from django.utils.text import capfirst
+from django.utils.translation import gettext
+
 from ietf.idtracker.models import Acronym, Area, PersonOrOrgInfo
 from ietf.idtracker.models import Role
+from ietf.mailinglists import CODE_AREA
+
 import random
 from datetime import datetime
 
@@ -120,6 +128,48 @@ class Meta:
     class Admin:
 	pass
 
+class AreaPsuedo (object) :
+    """
+    Psuedo class for Area model.
+    This only works when add new NonWgMailingList entry.
+    """
+    area_acronym = CODE_AREA["none"]
+    area_acronym_id = CODE_AREA["none"]
+    start_date = datetime.now()
+    concluded_date = datetime.now()
+    status = 1
+    comments = str()
+    last_modified_date = datetime.now()
+    extra_email_addresses = str()
+
+    def __str__ (self) :
+        return CODE_AREA["none"]
+
+class ModelChoiceFieldArea (forms.ModelChoiceField) :
+    def clean(self, value):
+        Field.clean(self, value)
+        if value in ('', None):
+            return None
+
+        if value in CODE_AREA.values() :
+                return AreaPsuedo()
+        else :
+                try:
+                    value = self.queryset.model._default_manager.get(pk=value)
+                except self.queryset.model.DoesNotExist:
+                    raise util.ValidationError(gettext(u'Select a valid choice. That choice is not one of the available choices.'))
+
+        return value
+
+
+class ForeignKeyArea (models.ForeignKey) :
+
+    def formfield(self, **kwargs):
+        defaults = {'queryset': self.rel.to._default_manager.all(), 'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
+        defaults.update(kwargs)
+        return ModelChoiceFieldArea(**defaults)
+
+
 class NonWgMailingList(models.Model):
     id = models.CharField(primary_key=True, maxlength=35)
     s_name = models.CharField("Submitter's Name", blank=True, maxlength=255)
@@ -128,7 +178,7 @@ class NonWgMailingList(models.Model):
     list_url = models.CharField("List URL", maxlength=255)
     admin = models.TextField("Administrator(s)' Email Address(es)", blank=True)
     purpose = models.TextField(blank=True)
-    area = models.ForeignKey(Area, db_column='area_acronym_id')
+    area = ForeignKeyArea(Area, db_column='area_acronym_id', null=True)
     subscribe_url = models.CharField("Subscribe URL", blank=True, maxlength=255)
     subscribe_other = models.TextField("Subscribe Other", blank=True)
     # Can be 0, 1, -1, or what looks like a person_or_org_tag, positive or neg.
@@ -152,6 +202,15 @@ def save(self, *args, **kwargs):
     def choices():
 	return [(list.id, list.list_name) for list in NonWgMailingList.objects.all().filter(status__gt=0)]
     choices = staticmethod(choices)
+
+    def __setattr__ (self, name, value) :
+        if name == "area_id" and str(value) in CODE_AREA.values() :
+                for k, v in CODE_AREA.iteritems() :
+                        if v == str(value) :
+                                setattr(self, "_area_cache", k)
+
+        super(NonWgMailingList, self).__setattr__(name,value)
+
     class Meta:
         db_table = 'none_wg_mailing_list'
 	ordering = ['list_name']

ietf/mailinglists/views.py

@@ -1,8 +1,9 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from forms import NonWgStep1, ListReqStep1, PickApprover, DeletionPickApprover, UrlMultiWidget, Preview, ListReqAuthorized, ListReqClose, MultiEmailField, AdminRequestor, ApprovalComment, ListApprover
+from forms import NonWgStep1, ListReqStep1, PickApprover, DeletionPickApprover, UrlMultiWidget, Preview, ListReqAuthorized, ListReqClose, MultiEmailField, AdminRequestor, ApprovalComment, ListApprover, SelectWidgetArea
 from models import NonWgMailingList, MailingList, Domain
-from ietf.idtracker.models import Area, PersonOrOrgInfo, AreaDirector, WGChair
+from ietf.idtracker.models import Area, PersonOrOrgInfo, AreaDirector, WGChair, Role
+from ietf.mailinglists import CODE_AREA
 from django import newforms as forms
 from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
@@ -15,6 +16,12 @@
 def formchoice(form, field):
     if not(form.is_valid()):
 	return None
+
+    if field == "area" and str(form.clean_data[field]) in CODE_AREA.values() :
+        for k, v in CODE_AREA.iteritems() :
+                if v == str(form.clean_data[field]) :
+                        return k
+
     d = str(form.clean_data[field])
     for k, v in form.fields[field].choices:
 	if str(k) == d:
@@ -49,6 +56,7 @@ def formchoice(form, field):
     'purpose': forms.Textarea(attrs = {'rows': 4, 'cols': 70}),
     'subscribe_url': UrlMultiWidget(choices=(('n/a', 'Not Applicable'), ('http://', 'http://'), ('https://', 'https://')), attrs = {'size': 50}),
     'subscribe_other': forms.Textarea(attrs = {'rows': 3, 'cols': 50}),
+    'area' : SelectWidgetArea(),
 }
 
 nonwg_querysets = {
@@ -103,15 +111,28 @@ def process_step(self, request, form, step):
 		self.form_list.append(forms.form_for_instance(NonWgMailingList.objects.get(pk=form.clean_data['list_id']), 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([ad.person_id for ad in list.area.areadirector_set.all()], DeletionPickApprover))
+                if str(list.area_id) in CODE_AREA.values() :
+                        __list_persons = [r.person.person_or_org_tag for r in Role.objects.filter(role_name__in=("IETF", "IAB"))]
+                else :
+                        __list_persons = [ad.person_id for ad in list.area.areadirector_set.all()]
+
+		self.form_list.append(gen_approval(__list_persons, DeletionPickApprover))
+
 		self.form_list.append(Preview)
 	else:
 	    self.clean_forms.append(form)
 	if step == 1:
 	    form0 = self.clean_forms[0]
 	    add_edit = form0.clean_data['add_edit']
 	    if add_edit == 'add' or add_edit == 'edit':
-		self.form_list.append(gen_approval([ad.person_id for ad in Area.objects.get(area_acronym=form.clean_data['area']).areadirector_set.all()], PickApprover))
+                # if area value is in CODE_AREA, approval person must be in 'IETF' and 'IAB'.
+                if str(form.clean_data["area"]) in CODE_AREA.values() :
+                        __list_persons = [r.person.person_or_org_tag for r in Role.objects.filter(role_name__in=("IETF", "IAB"))]
+                else :
+                        __list_persons = [ad.person_id for ad in Area.objects.get(area_acronym=form.clean_data['area']).areadirector_set.all()]
+
+		self.form_list.append(gen_approval(__list_persons, PickApprover))
+
 		self.form_list.append(Preview)
         super(NonWgWizard, self).process_step(request, form, step)
     def done(self, request, form_list):