Allow people to volunteer for NomCom via the datatracker. Commit ready for merge.

 - Legacy-Id: 19104

Author: rjsparks

ietf/bin/set_admin_permissions

@@ -39,7 +39,7 @@ def permission_names_to_objects(names):
             result.append(Permission.objects.get(content_type__app_label=app_label,
                                                  codename=codename))
         except Permission.DoesNotExist:
-            print "NO SUCH PERMISSION: %s, %s" % (app_label, codename)
+            print ("NO SUCH PERMISSION: %s, %s" % (app_label, codename))
             raise
 
     return result
@@ -61,6 +61,7 @@ def main():
              'group.add_groupevent','group.change_groupevent','group.delete_groupevent',
              'iesg.add_telechatagendaitem','iesg.change_telechatagendaitem','iesg.delete_telechatagendaitem',
              'iesg.add_telechatdate','iesg.change_telechatdate','iesg.delete_telechatdate',
+             'liaisons.add_liaisonstatementgroupcontacts', 'liaisons.change_liaisonstatementgroupcontacts', 'liaisons.delete_liaisonstatementgroupcontacts',
              'mailinglists.add_list','mailinglists.change_list','mailinglists.delete_list',
              'mailtrigger.add_mailtrigger','mailtrigger.change_mailtrigger','mailtrigger.delete_mailtrigger',
              'mailtrigger.add_recipient','mailtrigger.change_recipient','mailtrigger.delete_recipient',
@@ -71,6 +72,7 @@ def main():
              'meeting.add_urlresource','meeting.change_urlresource','meeting.delete_urlresource',
              'message.add_announcementfrom','message.change_announcementfrom','message.delete_announcementfrom',
              'nomcom.add_nomcom','nomcom.change_nomcom','nomcom.delete_nomcom',
+             'nomcom.add_volunteer','nomcom.change_volunteer','nomcom.delete_volunteer',
              'person.add_person','person.change_person','person.delete_person',
              'person.add_alias','person.change_alias','person.delete_alias',
              'person.add_email','person.change_email','person.delete_email',

ietf/doc/tests_ballot.py

@@ -1097,7 +1097,7 @@ def test_regenerate_last_call(self):
         lc_text = draft.latest_event(WriteupDocEvent, type="changed_last_call_text").text
         self.assertTrue("contains these normative down" in lc_text)
         self.assertTrue("rfc6666" in lc_text)
-        self.assertTrue("Independent Submission Editor stream" in lc_text)
+        self.assertTrue("Independent Submission" in lc_text)
 
         draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'),relationship_id='downref-approval')
 

ietf/ietfauth/tests.py

@@ -35,6 +35,7 @@
 from ietf.ietfauth.htpasswd import update_htpasswd_file
 from ietf.mailinglists.models import Subscribed
 from ietf.meeting.factories import MeetingFactory
+from ietf.nomcom.factories import NomComFactory
 from ietf.person.factories import PersonFactory, EmailFactory
 from ietf.person.models import Person, Email, PersonalApiKey
 from ietf.review.factories import ReviewRequestFactory, ReviewAssignmentFactory
@@ -333,6 +334,33 @@ def test_ietfauth_profile(self):
         self.assertEqual(updated_roles[0].email_id, new_email_address)
 
 
+    def test_nomcom_dressing_on_profile(self):
+        url = urlreverse('ietf.ietfauth.views.profile')
+
+        nobody = PersonFactory()
+        login_testing_unauthorized(self, nobody.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        q = PyQuery(r.content)
+        self.assertFalse(q('#volunteer-button'))
+        self.assertFalse(q('#volunteered'))
+
+        year = datetime.date.today().year
+        nomcom = NomComFactory(group__acronym=f'nomcom{year}',is_accepting_volunteers=True)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        q = PyQuery(r.content)
+        self.assertTrue(q('#volunteer-button'))
+        self.assertFalse(q('#volunteered'))
+
+        nomcom.volunteer_set.create(person=nobody)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        q = PyQuery(r.content)
+        self.assertFalse(q('#volunteer-button'))
+        self.assertTrue(q('#volunteered'))
+
+
     def test_reset_password(self):
         url = urlreverse(ietf.ietfauth.views.password_reset)
 

ietf/ietfauth/views.py

@@ -67,6 +67,7 @@
 from ietf.ietfauth.utils import role_required, has_role
 from ietf.mailinglists.models import Subscribed, Whitelisted
 from ietf.name.models import ExtResourceName
+from ietf.nomcom.models import NomCom
 from ietf.person.models import Person, Email, Alias, PersonalApiKey, PERSON_API_KEY_VALUES
 from ietf.review.models import ReviewerSettings, ReviewWish, ReviewAssignment
 from ietf.review.utils import unavailable_periods_to_list, get_default_filter_re
@@ -210,6 +211,14 @@ def profile(request):
     emails = Email.objects.filter(person=person).exclude(address__startswith='unknown-email-').order_by('-active','-time')
     new_email_forms = []
 
+    nc = NomCom.objects.filter(group__acronym__icontains=Date.today().year).first()
+    if nc and nc.volunteer_set.filter(person=person).exists():
+        volunteer_status = 'volunteered'
+    elif nc and nc.is_accepting_volunteers:
+        volunteer_status = 'allow'
+    else:
+        volunteer_status = 'deny'
+
     if request.method == 'POST':
         person_form = get_person_form(request.POST, instance=person)
         for r in roles:
@@ -287,6 +296,8 @@ def profile(request):
         'roles': roles,
         'emails': emails,
         'new_email_forms': new_email_forms,
+        'nomcom': nc,
+        'volunteer_status': volunteer_status,
         'settings':settings,
     })