Merged in [15549] from rjsparks@nostrum.com:

Renamed meeting.agenda_note to meeting.agenda_warning_note.
 - Legacy-Id: 15553
Note: SVN reference [15549] has been migrated to Git commit c9e1474076

ietf/meeting/migrations/0008_rename_meeting_agenda_note.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-10-09 13:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0007_auto_20180716_1337'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='meeting',
+            old_name='agenda_note',
+            new_name='agenda_warning_note',
+        ),
+    ]

ietf/meeting/models.py

@@ -93,7 +93,7 @@ class Meeting(models.Model):
     venue_addr = models.TextField(blank=True)
     break_area = models.CharField(blank=True, max_length=255)
     reg_area = models.CharField(blank=True, max_length=255)
-    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_warning_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     = ForeignKey('Schedule',null=True,blank=True, related_name='+')
     session_request_lock_message = models.CharField(blank=True,max_length=255) # locked if not empty
     proceedings_final = models.BooleanField(default=False, help_text=u"Are the proceedings for this meeting complete?")

ietf/meeting/resources.py

@@ -40,7 +40,7 @@ class MeetingResource(ModelResource):
             "venue_addr": ALL,
             "break_area": ALL,
             "reg_area": ALL,
-            "agenda_note": ALL,
+            "agenda_warning_note": ALL,
             "session_request_lock_message": ALL,
             "type": ALL_WITH_RELATIONS,
             "agenda": ALL_WITH_RELATIONS,

ietf/templates/meeting/agenda.html

@@ -137,8 +137,8 @@
 
         <h2>
           Schedule
-          {% if schedule.meeting.agenda_note %}
-            <span class="label label-danger">{{ schedule.meeting.agenda_note|removetags:"h1"|safe }}</span>
+          {% if schedule.meeting.agenda_warning_note %}
+            <span class="label label-danger">{{ schedule.meeting.agenda_warning_note|removetags:"h1"|safe }}</span>
           {% endif %}
         </h2>
 

ietf/templates/meeting/agenda.txt

@@ -1,8 +1,8 @@
 {% load humanize %}{% load ietf_filters %}{% autoescape off %}
 
 {% filter center:72 %} Agenda of the {{ schedule.meeting.number|ordinal }} IETF Meeting {% endfilter %}
-{% if schedule.meeting.agenda_note %}
-{% filter center:72 %}{{ schedule.meeting.agenda_note|striptags|wordwrap:72|safe }}{% endfilter %}
+{% if schedule.meeting.agenda_warning_note %}
+{% filter center:72 %}{{ schedule.meeting.agenda_warning_note|striptags|wordwrap:72|safe }}{% endfilter %}
 {% endif %}
 {% filter center:72 %}{{ schedule.meeting.date|date:"F j" }}-{% if schedule.meeting.date.month != schedule.meeting.end_date.month %}{{ schedule.meeting.end_date|date:"F " }}{% endif %}{{ schedule.meeting.end_date|date:"j, Y" }}{% endfilter %}
 {% filter center:72 %}Updated {{ updated|date:"Y-m-d H:i:s T" }}{% endfilter %}

ietf/templates/meeting/no-agenda.txt

@@ -1,8 +1,8 @@
 {% load humanize %}{% load ietf_filters %}{% autoescape off %}
 
 {% filter center:72 %} Agenda of the {{ meeting.number|ordinal }} IETF Meeting {% endfilter %}
-{% if meeting.agenda_note %}
-{% filter center:72 %}{{ meeting.agenda_note|striptags|wordwrap:72|safe }}{% endfilter %}
+{% if meeting.agenda_warning_note %}
+{% filter center:72 %}{{ meeting.agenda_warning_note|striptags|wordwrap:72|safe }}{% endfilter %}
 {% endif %}
 {% filter center:72 %}{{ meeting.date|date:"F j" }}-{% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}{{ meeting.end_date|date:"j, Y" }}{% endfilter %}