Merged in [13308] from rcross@amsl.com:

    Add ability for secretariat to skip announcement of regular interim meetings.  Fixes ietf-tools#2210.
 - Legacy-Id: 13321
Note: SVN reference [13308] has been migrated to Git commit 53615b0

Author: levkowetz

ietf/meeting/tests_views.py

@@ -1146,28 +1146,27 @@ def test_interim_request_details(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-    def test_interim_request_details_skip_announcement(self):
+    def test_interim_request_details_announcement(self):
+        '''Test access to Announce / Skip Announce features'''
         make_meeting_test_data()
         date = datetime.date.today() + datetime.timedelta(days=30)
-        self.client.login(username="secretary", password="secretary+password")
-
-        # ensure skip announcement option exists for Research Group
-        group = Group.objects.get(acronym='irg')
+        group = Group.objects.get(acronym='mars')
         meeting = make_interim_meeting(group=group, date=date, status='scheda')
         url = urlreverse('ietf.meeting.views.interim_request_details',kwargs={'number':meeting.number})
+
+        # Chair, no access
+        self.client.login(username="marschairman", password="marschairman+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q("a.btn:contains('Skip Announcement')")),1)
+        self.assertEqual(len(q("a.btn:contains('Announce')")),0)
 
-        # ensure skip announcement option does not exist for IETF Working Group
-        group = Group.objects.get(acronym='mars')
-        meeting = make_interim_meeting(group=group, date=date, status='scheda')
-        url = urlreverse('ietf.meeting.views.interim_request_details',kwargs={'number':meeting.number})
+        # Secretariat has access
+        self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q("a.btn:contains('Skip Announcement')")),0)
+        self.assertEqual(len(q("a.btn:contains('Announce')")),2)
 
     def test_interim_request_disapprove(self):
         make_meeting_test_data()

ietf/templates/meeting/interim_request_details.html

@@ -52,8 +52,6 @@ <h1>Interim Meeting Request Details</h1>
   {% endif %}
   {% if user|has_role:"Secretariat" and sessions.0.status.slug == 'scheda' %}
         <a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_send_announcement' number=meeting.number %}">Announce</a>
-  {% endif %}
-  {% if user|has_role:"Secretariat" and sessions.0.status.slug == 'scheda' and sessions.0.group.type.slug == 'rg' %}
         <a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_skip_announcement' number=meeting.number %}">Skip Announcement</a>
   {% endif %}
   {% if can_edit %}