Merge pull request #865 from freedomofpress/copy-affiliations-to-targ…

…eted-relations

Copy affiliations to targeted journalists and institutions

incident/migrations/0044_auto_20200306_1646.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.10 on 2020-03-06 16:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('incident', '0043_auto_20200226_1558'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='incidentpage',
+            name='targeted_institutions',
+            field=models.ManyToManyField(blank=True, related_name='institutions_incidents', to='incident.Institution', verbose_name='Targeted Institutions'),
+        ),
+    ]

incident/migrations/0045_copy_affiliation_to_institutions.py

@@ -0,0 +1,38 @@
+# Generated by Django 2.2.10 on 2020-03-05 21:28
+
+from django.db import migrations
+
+
+def copy_affiliation(apps, schema_editor):
+    """Copy incident affiliations to """
+    IncidentPage = apps.get_model('incident', 'IncidentPage')
+    Institution = apps.get_model('incident', 'Institution')
+
+    for incident in IncidentPage.objects.order_by('pk'):
+        if incident.affiliation and incident.affiliation != 'Independent':
+            inst, _ = Institution.objects.get_or_create(title=incident.affiliation)
+
+            targeted_journos = incident.targeted_journalists.all()
+            if targeted_journos:
+                for tj in targeted_journos:
+                    if not tj.institution:
+                        tj.institution = inst
+                        tj.save()
+            else:
+                incident.targeted_institutions.add(inst)
+                incident.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('incident', '0044_auto_20200306_1646'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            copy_affiliation,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
+    ]

incident/migrations/0046_auto_20200306_1648.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.10 on 2020-03-06 16:48
+
+from django.db import migrations
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('incident', '0045_copy_affiliation_to_institutions'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='incidentpage',
+            name='targeted_institutions',
+            field=modelcluster.fields.ParentalManyToManyField(blank=True, related_name='institutions_incidents', to='incident.Institution', verbose_name='Targeted Institutions'),
+        ),
+    ]

incident/templates/incident/incident_page.html

@@ -83,19 +83,6 @@ <h2 class="sr-only section-heading">Incident Data</h2>
 				</tr>
 			{% endif %}
 
-			{% if page.affiliation %}
-				<tr class="data-table__row">
-					<th class="data-table__label">
-						Affiliation
-					</th>
-					<td class="data-table__value">
-						<a href="{% pageurl page.get_parent %}?affiliation={{ page.affiliation }}">
-							{{ page.affiliation }}
-						</a>
-					</td>
-				</tr>
-			{% endif %}
-
 			{% if page.city or page.state %}
 				<tr class="data-table__row">
 					<th class="data-table__label">