From fab9580bb018d4743c634f0c3f581a6a64ebc040 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Tue, 8 Oct 2019 22:24:06 +0000
Subject: [PATCH] Merged in [16815] from rjsparks@nostrum.com:

    Link to the about pages for groups even if they don't have a charter (some have other forms of descriptive text, and all have more information on the group pages than they did a few years ago). Fixes #2744.
 - Legacy-Id: 16848
Note: SVN reference [16815] has been migrated to Git commit 26e3e62c567d8146a27a976f1da0710eeda46ba2
---
 ietf/group/tests_review.py         | 8 ++++----
 ietf/templates/meeting/agenda.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index d63374c8a..1b0aa8bc2 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -564,11 +564,11 @@ class ReviewTests(TestCase):
         self.assertTrue(secretary.person.email_address() in outbox[0]["To"])
         self.assertEqual(outbox[0]["Subject"], "1 Overdue review for team {}".format(review_req.team.acronym))
         message = outbox[0].get_payload(decode=True).decode("utf-8")
-        self.assertTrue(review_req.team.acronym + ' has 1 accepted or assigned review overdue by at least 5 days.' in message)
-        self.assertTrue('Review of {} by {}'.format(review_req.doc.name, reviewer.name) in message)
+        self.assertIn(review_req.team.acronym + ' has 1 accepted or assigned review overdue by at least 5 days.', message)
+        self.assertIn('Review of {} by {}'.format(review_req.doc.name, reviewer.plain_name()), message)
         self.assertEqual(len(log), 1)
-        self.assertTrue(secretary.person.email_address() in log[0])
-        self.assertTrue('1 overdue review' in log[0])
+        self.assertIn(secretary.person.email_address(), log[0])
+        self.assertIn('1 overdue review', log[0])
         
     def test_send_reminder_all_open_reviews(self):
         review_req = ReviewRequestFactory(state_id='assigned')
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index aed578d1e..1dbc3cea1 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -291,7 +291,7 @@
 		      <td><span class="hidden-xs">{{item.session.historic_group.historic_parent.acronym}}</span></td>
 
                     <td>
-                      {% if item.session.historic_group.charter %}
+                      {% if item.session.historic_group %}
                         <a href="{% url 'ietf.group.views.group_about' acronym=item.session.historic_group.acronym %}">{{item.session.historic_group.acronym}}</a>
                       {% else %}
                         {{item.session.historic_group.acronym}}