Do not use the term "Blacklisted" in the UI

"Blacklisting" is a very internal concept in AlertEngine. The net effect for users editing their profiles is that an alert sender is currently non-functional, for some reason. This changes the UI to just refer to the address types as currently non-functional.
johannaengland · Sep 7, 2023 · 842a6b0 · 842a6b0
1 parent aea5b83
commit 842a6b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/python/nav/web/templates/alertprofiles/address_list.html b/python/nav/web/templates/alertprofiles/address_list.html
@@ -63,7 +63,7 @@
                 {% if not a.type.supported %}
                     <div class="alert-box error with-icon inside-table">{{ a.type.name }}: No longer supported</div>
                 {% elif a.type.blacklisted_reason %}
-                    <div class="alert-box warning inside-table">{{ a.type.name }}: Blacklisted - {{ a.type.blacklisted_reason }}</div>
+                    <div class="alert-box warning inside-table">{{ a.type.name }} is currently non-functional: {{ a.type.blacklisted_reason }}</div>
                 {% else %}
                     {{ a.type.name }}
                 {% endif %}

diff --git a/python/nav/web/templates/alertprofiles/subscription_form.html b/python/nav/web/templates/alertprofiles/subscription_form.html
@@ -44,7 +44,7 @@ <h4>
                 <td><a href="{% url 'alertprofiles-filter_groups-detail' s.filter_group.id %}">{{ s.filter_group.name }}</a></td>
                 <td>
                     {% if not s.alert_address.type.supported %}<div class="alert-box error with-icon inside-table" title="{{ s.alert_address.type.name }} is no longer supported">{% endif %}
-                    {% if s.alert_address.type.blacklisted_reason %}<div class="alert-box warning inside-table" title="{{ s.alert_address.type.name }} is blacklisted: {{ s.alert_address.type.blacklisted_reason }}">{% endif %}
+                    {% if s.alert_address.type.blacklisted_reason %}<div class="alert-box warning inside-table" title="{{ s.alert_address.type.name }} is currently non-functional: {{ s.alert_address.type.blacklisted_reason }}">{% endif %}
                     <a href="{% url 'alertprofiles-address-detail' s.alert_address.id %}">{{ s.alert_address }}</a>
                     {% if not s.alert_address.type.supported or s.alert_address.type.blacklisted_reason %}</div>{% endif %}
                 </td>

diff --git a/python/nav/web/templates/alertprofiles/timeperiods.html b/python/nav/web/templates/alertprofiles/timeperiods.html
@@ -50,7 +50,7 @@
                 Watch <em><a href="{% url 'alertprofiles-filter_groups-detail' b.filter_group.id %}">{{ b.filter_group.name }}</a></em>,
                 send to
                 {% if not b.alert_address.type.supported %}<div class="alert-box error with-icon inside-table" title="{{ b.alert_address.type.name }} is no longer supported">{% endif %}
-                {% if b.alert_address.type.blacklisted_reason %}<div class="alert-box warning inside-table" title="{{ b.alert_address.type.name }} is blacklisted: {{b.alert_address.type.blacklisted_reason}}">{% endif %}
+                {% if b.alert_address.type.blacklisted_reason %}<div class="alert-box warning inside-table" title="{{ b.alert_address.type.name }} is currently non-functional: {{b.alert_address.type.blacklisted_reason}}">{% endif %}
                 <em><a href="{% url 'alertprofiles-address-detail' b.alert_address.id %}">{{ b.alert_address.address }}</a></em>
                 {% if not b.alert_address.type.supported or b.alert_address.type.blacklisted_reason %}</div>{% endif %},
                 {{ b.get_type_display }}.