Hide the "Confirmation Needed" notice if email channel verification is turned off. Update changelog.

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 ### Improvements
 - Add the EMAIL_USE_VERIFICATION configuration setting (#232)
 - Show "Badges" and "Settings" in top navigation (#234)
+- Upgrade to Django 2.2
 
 
 ## 1.6.0 - 2019-04-01

hc/front/tests/test_add_email.py

@@ -12,6 +12,7 @@ class AddEmailTestCase(BaseTestCase):
         self.client.login(username="alice@example.org", password="password")
         r = self.client.get(self.url)
         self.assertContains(r, "Get an email message")
+        self.assertContains(r, "Confirmation needed")
 
     def test_it_creates_channel(self):
         form = {"value": "alice@example.org"}
@@ -58,6 +59,12 @@ class AddEmailTestCase(BaseTestCase):
         c = Channel.objects.get()
         self.assertEqual(c.value, "alice@example.org")
 
+    @override_settings(EMAIL_USE_VERIFICATION=False)
+    def test_it_hides_confirmation_needed_notice(self):
+        self.client.login(username="alice@example.org", password="password")
+        r = self.client.get(self.url)
+        self.assertNotContains(r, "Confirmation needed")
+
     @override_settings(EMAIL_USE_VERIFICATION=False)
     def test_it_auto_verifies_email(self):
         form = {"value": "alice@example.org"}

hc/front/views.py

@@ -698,6 +698,7 @@ def add_email(request):
     ctx = {
         "page": "channels",
         "project": request.project,
+        "use_verification": settings.EMAIL_USE_VERIFICATION,
         "form": form
     }
     return render(request, "integrations/add_email.html", ctx)

templates/integrations/add_email.html

@@ -16,11 +16,13 @@
         Add multiple email addresses, to notify multiple team members.
     </p>
 
+    {% if use_verification %}
     <p>
         <strong>Confirmation needed.</strong>
         After entering an email address, {% site_name %} will send out a confirmation link.
         Only confirmed addresses will receive notifications.
     </p>
+    {% endif %}
 
     <h2>Integration Settings</h2>