From a66639299da119f2f79bcd905576028674304454 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 5 May 2018 12:47:55 +0000
Subject: [PATCH] Removed all references to the removed Person.affiliation
field. - Legacy-Id: 15129
---
ietf/doc/views_search.py | 1 -
ietf/person/utils.py | 2 +-
ietf/secr/rolodex/tests.py | 1 -
ietf/secr/templates/includes/search_results_table.html | 2 --
ietf/secr/templates/rolodex/view.html | 2 --
ietf/templates/person/person_info.html | 8 +-------
ietf/templates/utils/merge_person_records.txt | 2 --
7 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py
index ccfbd136b..51f9f27d0 100644
--- a/ietf/doc/views_search.py
+++ b/ietf/doc/views_search.py
@@ -175,7 +175,6 @@ def retrieve_search_results(form, all_types=False):
if by == "author":
docs = docs.filter(
Q(documentauthor__person__alias__name__icontains=query["author"]) |
- Q(documentauthor__person__affiliation__icontains=query["author"]) |
Q(documentauthor__person__email__address__icontains=query["author"])
)
elif by == "group":
diff --git a/ietf/person/utils.py b/ietf/person/utils.py
index ab8382322..51bae8a21 100755
--- a/ietf/person/utils.py
+++ b/ietf/person/utils.py
@@ -34,7 +34,7 @@ def merge_persons(source, target, file=sys.stdout, verbose=False):
dedupe_aliases(target)
# copy other attributes
- for field in ('ascii','ascii_short','affiliation'):
+ for field in ('ascii','ascii_short', 'biography', 'photo', 'photo_thumb', 'name_from_draft'):
if getattr(source,field) and not getattr(target,field):
setattr(target,field,getattr(source,field))
target.save()
diff --git a/ietf/secr/rolodex/tests.py b/ietf/secr/rolodex/tests.py
index 9616e8f66..a4df74453 100644
--- a/ietf/secr/rolodex/tests.py
+++ b/ietf/secr/rolodex/tests.py
@@ -61,7 +61,6 @@ class RolodexTestCase(TestCase):
'name': person.name,
'ascii': person.ascii,
'ascii_short': person.ascii_short,
- 'affiliation': person.affiliation,
'user': user.username,
'email-0-person':person.pk,
'email-0-address': person.email_address(),
diff --git a/ietf/secr/templates/includes/search_results_table.html b/ietf/secr/templates/includes/search_results_table.html
index dc23455fc..97abd16f3 100644
--- a/ietf/secr/templates/includes/search_results_table.html
+++ b/ietf/secr/templates/includes/search_results_table.html
@@ -2,7 +2,6 @@
<thead>
<tr>
<th>Name</th>
- <th>Company</th>
<th>Email</th>
<th>ID</th>
</tr>
@@ -11,7 +10,6 @@
{% for item in results %}
<tr class="{% cycle 'row1' 'row2' %}">
<td><a href="{% url 'ietf.secr.rolodex.views.view' id=item.person.id %}">{{item.name}}</a></td>
- <td>{{item.person.affiliation}}</td>
<td>{{item.person.email_address}}</td>
<td>{{item.person.id}}</a></td>
</tr>
diff --git a/ietf/secr/templates/rolodex/view.html b/ietf/secr/templates/rolodex/view.html
index 32eb4d506..6bfa0b45f 100644
--- a/ietf/secr/templates/rolodex/view.html
+++ b/ietf/secr/templates/rolodex/view.html
@@ -18,8 +18,6 @@
<tr><td>Ascii Name:</td><td>{{ person.ascii }}</td></tr>
<tr><td>Short Name:</td><td>{{ person.ascii_short }}</td></tr>
<tr><td>Aliases:</td><td>{% for alias in person.alias_set.all %}{% if not forloop.first %}, {% endif %}{{ alias.name }}{% endfor %}
- <tr><td>Address:</td><td>{{ person.address }}</td></tr>
- <tr><td>Affiliation:</td><td>{{ person.affiliation }}</td></tr>
<tr><td>User:</td><td>{{ person.user }}</td></tr>
<tr></tr>
{% for email in person.emails %}
diff --git a/ietf/templates/person/person_info.html b/ietf/templates/person/person_info.html
index c1a800bc4..fc47969e7 100644
--- a/ietf/templates/person/person_info.html
+++ b/ietf/templates/person/person_info.html
@@ -2,12 +2,6 @@
<div class="row">
<div class="col-md-2">Name:</div><div class="col-md-10">{{ person.name }}</div>
</div>
- <div class="row">
- <div class="col-md-2">Address:</div><div class="col-md-10">{{ person.address }}</div>
- </div>
- <div class="row">
- <div class="col-md-2">Affiliation:</div><div class="col-md-10">{{ person.affiliation}}</div>
- </div>
<div class="row">
<div class="col-md-2">Login:</div><div class="col-md-10">{% if person.user %}{{ person.user }} (last used: {% if person.user.last_login %}{{ person.user.last_login|date:"Y-m-d" }}{% else %}never{% endif %}){% endif %}</div>
</div>
@@ -19,4 +13,4 @@
<div class="row">
<div class="col-md-2">Role{{ person.role_set.count|pluralize }}:</div><div class="col-md-10">{% for role in person.role_set.all %}{{ role.name }} {{ role.group.acronym }}{% if not forloop.last %}, {% endif %}{% endfor %}</div>
</div>
- </div>
\ No newline at end of file
+ </div>
diff --git a/ietf/templates/utils/merge_person_records.txt b/ietf/templates/utils/merge_person_records.txt
index 2673a1181..69c8e7bdd 100644
--- a/ietf/templates/utils/merge_person_records.txt
+++ b/ietf/templates/utils/merge_person_records.txt
@@ -7,8 +7,6 @@ The merged record is:
Name: {{ person.plain_name }}
Aliases: {{ person.alias_set.all|join:", " }}
-Address: {{ person.address }}
-Affiliation: {{ person.affiliation }}
User (login): {{ person.user.username }}
Emails: