From 485fcd0e53eb4c34311f1b76985320eac9aa30bf Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Mon, 8 Aug 2016 23:26:51 +0000 Subject: [PATCH 1/2] Add new field meeting.acknowledgements and corresponding page in meeting proceedings. Commit ready for merge. - Legacy-Id: 11765 --- ietf/meeting/models.py | 1 + ietf/meeting/tests_views.py | 15 +++++++++++++++ ietf/meeting/urls.py | 1 + ietf/meeting/views.py | 8 ++++++++ ietf/templates/meeting/proceedings.html | 9 +++++++++ 5 files changed, 34 insertions(+) diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 6f660d621..fc509773e 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -80,6 +80,7 @@ class Meeting(models.Model): agenda_note = models.TextField(blank=True, help_text="Text in this field will be placed at the top of the html agenda page for the meeting. HTML can be used, but will not be validated.") agenda = models.ForeignKey('Schedule',null=True,blank=True, related_name='+') session_request_lock_message = models.CharField(blank=True,max_length=255) # locked if not empty + acknowledgements = models.TextField(blank=True, help_text="Acknowledgements for use in meeting proceedings. Use ReStructuredText markup.") def __unicode__(self): if self.type_id == "ietf": diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 9ac736406..a8d272519 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -1146,3 +1146,18 @@ class FloorPlanTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) + +class ProceedingsTests(TestCase): + def setUp(self): + pass + + def tearDown(self): + pass + + def test_proceedings_acknowledgements(self): + meeting = make_meeting_test_data() + url = urlreverse('ietf.meeting.views.proceedings_acknowledgements',kwargs={'num':meeting.number}) + login_testing_unauthorized(self,"secretary",url) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + \ No newline at end of file diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index 5cee0de7b..79ca2604d 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -67,6 +67,7 @@ type_ietf_only_patterns_id_optional = [ url(r'^room-view(?:.html)?/?$', views.room_view), url(r'^materials(?:.html)?/?$', views.materials), url(r'^proceedings(?:.html)?/?$', views.proceedings), + url(r'^proceedings/acknowledgements/$', views.proceedings_acknowledgements), ] urlpatterns = [ diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 7403790ef..b33de8ae9 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -1468,3 +1468,11 @@ def proceedings(request, num=None): 'submission_started': now > begin_date, 'cache_version': cache_version, }) + +@role_required('Secretariat') +def proceedings_acknowledgements(request, num=None): + + meeting = get_meeting(num) + return render(request, "meeting/proceedings_acknowledgements.html", { + 'meeting': meeting, + }) diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html index 4eff2d783..6d1595db3 100644 --- a/ietf/templates/meeting/proceedings.html +++ b/ietf/templates/meeting/proceedings.html @@ -23,6 +23,14 @@ This page is under construction

+

Introduction

+
+ Acknowledgements + IETF Overview + Progress Report + Attendees +
+ {# cache for 15 minutes, as long as there's no proceedings activity. takes 4-8 seconds to generate. #} {% load cache %} {% cache 900 ietf_meeting_materials meeting_num cache_version %} @@ -154,6 +162,7 @@