From 990493f1c4ee2fa2845d87d5f55469573b6b1e70 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Sat, 25 Mar 2017 19:20:34 +0000 Subject: [PATCH] Add Country column to meeting/NN/proceedings/attendees. Fixes #2228. Commit ready for merge. - Legacy-Id: 13113 --- .../migrations/0048_recreate_97_attendees.py | 29 +++++++++++++++++++ .../meeting/proceedings_attendees_table.html | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 ietf/meeting/migrations/0048_recreate_97_attendees.py diff --git a/ietf/meeting/migrations/0048_recreate_97_attendees.py b/ietf/meeting/migrations/0048_recreate_97_attendees.py new file mode 100644 index 000000000..2684de9ea --- /dev/null +++ b/ietf/meeting/migrations/0048_recreate_97_attendees.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.6 on 2017-03-25 12:01 +from __future__ import unicode_literals + +from django.db import migrations +from ietf.meeting.utils import create_proceedings_templates + +def forward(apps, schema_editor): + Meeting = apps.get_model('meeting', 'Meeting') + DBTemplate = apps.get_model('dbtemplate', 'DBTemplate') + + meeting = Meeting.objects.get(number=97) + template = DBTemplate.objects.get(path='/meeting/proceedings/97/attendees.html') + template.delete() + create_proceedings_templates(meeting) + +def backward(apps, schema_editor): + pass + + +class Migration(migrations.Migration): + + dependencies = [ + ('meeting', '0047_import_shared_audio_files'), + ] + + operations = [ + migrations.RunPython(forward, backward) + ] diff --git a/ietf/templates/meeting/proceedings_attendees_table.html b/ietf/templates/meeting/proceedings_attendees_table.html index 5cba89484..17a5e7ab5 100644 --- a/ietf/templates/meeting/proceedings_attendees_table.html +++ b/ietf/templates/meeting/proceedings_attendees_table.html @@ -4,6 +4,7 @@ Last Name First Name Organization + Country @@ -12,6 +13,7 @@ {{ attendee.LastName }} {{ attendee.FirstName }} {{ attendee.Company }} + {{ attendee.Country }} {% endfor %}