Refactor mange group views:

 * Create a new models NomComGroup with public_key field. Default type is nomcom
 * News urls and views to separate members and chair forms
 * Add rolodex url when person not found.
 * Views access is only for secretariat and chair roles
See ietf-tools#904
 - Legacy-Id: 5069

Author: ejimenez

ietf/nomcom/admin.py

@@ -0,0 +1,11 @@
+from django.contrib import admin
+
+from ietf.group.admin import GroupAdmin
+from ietf.nomcom.models import NomComGroup
+
+
+class NomComGroupAdmin(GroupAdmin):
+    exclude = ('type',)
+
+
+admin.site.register(NomComGroup, NomComGroupAdmin)

ietf/nomcom/forms.py

@@ -1,61 +1,58 @@
 from django import forms
 from django.contrib.formtools.preview import FormPreview
 from django.http import HttpResponseRedirect, HttpResponseForbidden
+from django.shortcuts import get_object_or_404
 from django.core.urlresolvers import reverse
+from django.conf import settings
 
 from ietf.ietfauth.decorators import has_role
 from ietf.utils import fields as custom_fields
-from ietf.group.models import Group, Role
+from ietf.group.models import Role
+from ietf.nomcom.models import NomComGroup
 from ietf.name.models import RoleName
 from ietf.person.models import Email
 
 
-class ManageGroupForm(forms.Form):
+ROLODEX_URL = getattr(settings, 'ROLODEX_URL', None)
 
-    chair = forms.EmailField(label="Chair email", required=False,
-                             widget=forms.TextInput(attrs={'size': '40'}))
-    members = custom_fields.MultiEmailField(label="Members email", required=False)
 
-    def __init__(self, *args, **kwargs):
-        super(ManageGroupForm, self).__init__(*args, **kwargs)
+class EditMembersForm(forms.Form):
 
+    members = custom_fields.MultiEmailField(label="Members email", required=False)
 
-class ManageGroupFormPreview(FormPreview):
-    form_template = 'nomcom/manage_group.html'
-    preview_template = 'nomcom/manage_group_review.html'
 
-    def preview_get(self, request):
-        if not has_role(request.user, "Secretariat"):
-            return HttpResponseForbidden("Must be a secretariat")
+class EditMembersFormPreview(FormPreview):
+    form_template = 'nomcom/edit_members.html'
+    preview_template = 'nomcom/edit_members_preview.html'
+
+    def __call__(self, request, *args, **kwargs):
+        year = kwargs['year']
+        group = get_object_or_404(NomComGroup,
+                                  acronym__icontains=year,
+                                  state__slug='active')
+        is_group_chair = bool(group.role_set.filter(person__user=request.user, name__slug='chair')[:1])
+        is_secretariat = has_role(request.user, "Secretariat")
+        if not is_secretariat and not is_group_chair:
+            return HttpResponseForbidden("Must be a secretariat or group chair")
 
-        return super(ManageGroupFormPreview, self).preview_get(request)
+        self.state['group'] = group
+        self.state['rolodex_url'] = ROLODEX_URL
+        self.group = group
+        self.year = year
 
+        return super(EditMembersFormPreview, self).__call__(request, *args, **kwargs)
 
     def parse_params(self, *args, **kwargs):
-        group_acronym = kwargs['acronym']
-        group = Group.objects.get(acronym=group_acronym)
-        chairs = group.role_set.filter(name__slug='chair')
-        members = group.role_set.filter(name__slug='member')
-        if chairs:
-            self.form.base_fields['chair'].initial = chairs[0].email.address
+        members = self.group.role_set.filter(name__slug='member')
+
         if members:
             self.form.base_fields['members'].initial = ',\r\n'.join([role.email.address for role in members])
-        self.state['group'] = group
 
     def process_preview(self, request, form, context):
-        chair_email = form.cleaned_data['chair']
         members_email = form.cleaned_data['members'].replace('\r\n', '').replace(' ', '').split(',')
+
         members_info = []
         emails_not_found = []
-        try:
-            chair_email_obj = Email.objects.get(address=chair_email)
-            chair_person = chair_email_obj.person
-        except Email.DoesNotExist:
-            chair_person = None
-            chair_email_obj = None
-        chair_info = {'email': chair_email,
-                      'email_obj': chair_email_obj,
-                      'person': chair_person}
 
         for email in members_email:
             try:
@@ -69,29 +66,76 @@ def process_preview(self, request, form, context):
                                      'person': person})
             else:
                 emails_not_found.append(email)
-        self.state.update({'chair_info': chair_info,
-                           'members_info': members_info,
+        self.state.update({'members_info': members_info,
                            'emails_not_found': emails_not_found})
 
     def done(self, request, cleaned_data):
-        group = self.state['group']
-        chair_info = self.state['chair_info']
         members_info = self.state['members_info']
         members_email = [member['email'] for member in self.state['members_info']]
-        members_excluded = group.role_set.filter(name__slug='member').exclude(email__address__in=members_email)
+        members_excluded = self.group.role_set.filter(name__slug='member').exclude(email__address__in=members_email)
         members_excluded.delete()
         for member in members_info:
             Role.objects.get_or_create(name=RoleName.objects.get(slug="member"),
-                                       group=group,
+                                       group=self.group,
                                        person=member['person'],
                                        email=member['email_obj'])
 
-        chair_exclude = group.role_set.filter(name__slug='chair').exclude(email__address=chair_info['email'])
+        return HttpResponseRedirect(reverse('edit_members', kwargs={'year': self.year}))
+
+
+class EditChairForm(forms.Form):
+
+    chair = forms.EmailField(label="Chair email", required=False,
+                             widget=forms.TextInput(attrs={'size': '40'}))
+
+
+class EditChairFormPreview(FormPreview):
+    form_template = 'nomcom/edit_chair.html'
+    preview_template = 'nomcom/edit_chair_preview.html'
+
+    def __call__(self, request, *args, **kwargs):
+        year = kwargs['year']
+        group = get_object_or_404(NomComGroup,
+                                  acronym__icontains=year,
+                                  state__slug='active')
+        is_secretariat = has_role(request.user, "Secretariat")
+        if not is_secretariat:
+            return HttpResponseForbidden("Must be a secretariat")
+
+        self.state['group'] = group
+        self.state['rolodex_url'] = ROLODEX_URL
+        self.group = group
+        self.year = year
+
+        return super(EditChairFormPreview, self).__call__(request, *args, **kwargs)
+
+    def parse_params(self, *args, **kwargs):
+        chairs = self.group.role_set.filter(name__slug='chair')
+        if chairs:
+            self.form.base_fields['chair'].initial = chairs[0].email.address
+
+    def process_preview(self, request, form, context):
+        chair_email = form.cleaned_data['chair']
+        try:
+            chair_email_obj = Email.objects.get(address=chair_email)
+            chair_person = chair_email_obj.person
+        except Email.DoesNotExist:
+            chair_person = None
+            chair_email_obj = None
+        chair_info = {'email': chair_email,
+                      'email_obj': chair_email_obj,
+                      'person': chair_person}
+
+        self.state.update({'chair_info': chair_info})
+
+    def done(self, request, cleaned_data):
+        chair_info = self.state['chair_info']
+        chair_exclude = self.group.role_set.filter(name__slug='chair').exclude(email__address=chair_info['email'])
         chair_exclude.delete()
         if chair_info['email_obj'] and chair_info['person']:
             Role.objects.get_or_create(name=RoleName.objects.get(slug="chair"),
-                                      group=group,
+                                      group=self.group,
                                       person=chair_info['person'],
                                       email=chair_info['email_obj'])
 
-        return HttpResponseRedirect(reverse('manage_group', kwargs={'acronym': group.acronym}))
+        return HttpResponseRedirect(reverse('edit_chair', kwargs={'year': self.year}))