This is the first step towards using Role to represent Area directors. It

- Migrates the information captured in GroupInfo.ad to Role objects.
- Renames GroupInfo.ad to GroupInfo._ad (retaining the current column name) to prepare for deletion of that field.
- Provides ad property accessor and setter methods implemented using the group's role_set (so that the existing view code continues to work with minimal changes)
- Improved selection in many querysets that assumed only groups of type 'area' would have area directors.

Related to ietf-tools#1557 and ietf-tools#1555.

Commit ready to merge.
 - Legacy-Id: 8851

Author: rjsparks

ietf/doc/forms.py

@@ -21,7 +21,7 @@ def __init__(self, *args, **kwargs):
 from ietf.person.models import Person
 
 class AdForm(forms.Form):
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'),
+    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type='area').order_by('name'),
                                 label="Shepherding AD", empty_label="(None)", required=True)
 
     def __init__(self, *args, **kwargs):

ietf/doc/mails.py

@@ -326,7 +326,7 @@ def email_ballot_undeferred(request, doc, by, telechat_date):
                    telechat_date=telechat_date))
 
 def generate_issue_ballot_mail(request, doc, ballot):
-    active_ads = Person.objects.filter(role__name="ad", role__group__state="active").distinct()
+    active_ads = Person.objects.filter(role__name="ad", role__group__state="active", role__group__type="area").distinct()
 
     positions = BallotPositionDocEvent.objects.filter(doc=doc, type="changed_ballot_position", ballot=ballot).order_by("-time", '-id').select_related('ad')
 

ietf/doc/models.py

@@ -721,7 +721,7 @@ class BallotDocEvent(DocEvent):
 
     def active_ad_positions(self):
         """Return dict mapping each active AD to a current ballot position (or None if they haven't voted)."""
-        active_ads = list(Person.objects.filter(role__name="ad", role__group__state="active"))
+        active_ads = list(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type="area"))
         res = {}
 
         positions = BallotPositionDocEvent.objects.filter(type="changed_ballot_position",ad__in=active_ads, ballot=self).select_related('ad', 'pos').order_by("-time", "-id")
@@ -740,7 +740,7 @@ def all_positions(self):
 
         positions = []
         seen = {}
-        active_ads = list(Person.objects.filter(role__name="ad", role__group__state="active").distinct())
+        active_ads = list(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type="area").distinct())
         for e in BallotPositionDocEvent.objects.filter(type="changed_ballot_position", ballot=self).select_related('ad', 'pos').order_by("-time", '-id'):
             if e.ad not in seen:
                 e.old_ad = e.ad not in active_ads

ietf/doc/utils_charter.py

@@ -154,7 +154,7 @@ def default_review_text(group, charter, by):
     return e
 
 def generate_issue_ballot_mail(request, doc, ballot):
-    active_ads = Person.objects.filter(email__role__name="ad", email__role__group__state="active").distinct()
+    active_ads = Person.objects.filter(email__role__name="ad", email__role__group__state="active", email__role__group__type="area").distinct()
 
     seen = []
     positions = []

ietf/doc/views_charter.py

@@ -280,7 +280,7 @@ def change_title(request, name, option=None):
                               context_instance=RequestContext(request))
 
 class AdForm(forms.Form):
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'),
+    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type="area").order_by('name'),
                                 label="Responsible AD", empty_label="(None)", required=True)
 
     def __init__(self, *args, **kwargs):

ietf/doc/views_conflict_review.py

@@ -327,7 +327,7 @@ class SimpleStartReviewForm(forms.Form):
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)
 
 class StartReviewForm(forms.Form):
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'), 
+    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), 
                                 label="Shepherding AD", empty_label="(None)", required=True)
     create_in_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev", slug__in=("needshep", "adrev")), empty_label=None, required=False)
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)

ietf/doc/views_draft.py

@@ -470,7 +470,7 @@ def change_intention(request, name):
 class EditInfoForm(forms.Form):
     intended_std_level = forms.ModelChoiceField(IntendedStdLevelName.objects.filter(used=True), empty_label="(None)", required=True, label="Intended RFC status")
     area = forms.ModelChoiceField(Group.objects.filter(type="area", state="active"), empty_label="(None - individual submission)", required=False, label="Assigned to area")
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'), label="Responsible AD", empty_label="(None)", required=True)
+    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), label="Responsible AD", empty_label="(None)", required=True)
     create_in_state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg", slug__in=("pub-req", "watching")), empty_label=None, required=False)
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)
     note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False)
@@ -1039,7 +1039,7 @@ def change_shepherd_email(request, name):
     })
 
 class AdForm(forms.Form):
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'), 
+    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type="area").order_by('name'), 
                                 label="Shepherding AD", empty_label="(None)", required=True)
 
     def __init__(self, *args, **kwargs):

ietf/doc/views_status_change.py

@@ -438,7 +438,7 @@ def clean(self):
 class StartStatusChangeForm(forms.Form):
     document_name = forms.CharField(max_length=255, label="Document name", help_text="A descriptive name such as status-change-md2-to-historic is better than status-change-rfc1319", required=True)
     title = forms.CharField(max_length=255, label="Title", required=True)
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'), 
+    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), 
                                 label="Shepherding AD", empty_label="(None)", required=True)
     create_in_state = forms.ModelChoiceField(State.objects.filter(type="statchg", slug__in=("needshep", "adrev")), empty_label=None, required=False)
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)

ietf/group/admin.py

@@ -26,7 +26,7 @@ class GroupAdmin(admin.ModelAdmin):
     list_filter = ["type", "state", "time"]
     search_fields = ["acronym", "name"]
     ordering = ["name"]
-    raw_id_fields = ["charter", "parent", "ad"]
+    raw_id_fields = ["charter", "parent", "_ad"]
     inlines = [RoleInline, GroupURLInline]
     prepopulated_fields = {"acronym": ("name", )}
 
@@ -107,7 +107,7 @@ class GroupHistoryAdmin(admin.ModelAdmin):
     list_filter = ["type"]
     search_fields = ["acronym", "name"]
     ordering = ["name"]
-    raw_id_fields = ["group", "parent", "ad"]
+    raw_id_fields = ["group", "parent", "_ad"]
 
 admin.site.register(GroupHistory, GroupHistoryAdmin)
 

ietf/group/edit.py

@@ -34,7 +34,7 @@ class GroupForm(forms.Form):
     techadv = AutocompletedEmailsField(label="Technical Advisors", required=False, only_users=True)
     delegates = AutocompletedEmailsField(required=False, only_users=True, max_entries=MAX_GROUP_DELEGATES,
                                           help_text=mark_safe("Chairs can delegate the authority to update the state of group documents - max %s persons at a given time" % MAX_GROUP_DELEGATES))
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'), label="Shepherding AD", empty_label="(None)", required=False)
+    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type='area').order_by('name'), label="Shepherding AD", empty_label="(None)", required=False)
     parent = forms.ModelChoiceField(Group.objects.filter(state="active").order_by('name'), empty_label="(None)", required=False)
     list_email = forms.CharField(max_length=64, required=False)
     list_subscribe = forms.CharField(max_length=255, required=False)