From 7d2434fbcbe85e0e195e8c83610447555160d0cd Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Wed, 8 Nov 2023 18:36:10 +0000
Subject: [PATCH 1/2] fix(templates): bs danger alert;

- Updated `alert-error` to `alert-danger` for BS3+.
---
 ckan/lib/helpers.py                                       | 2 +-
 ckan/templates/group/snippets/info.html                   | 2 +-
 ckan/templates/organization/snippets/info.html            | 2 +-
 ckan/templates/package/snippets/info.html                 | 2 +-
 ckan/templates/user/snippets/info.html                    | 4 ++--
 .../datapusher/templates/datapusher/resource_data.html    | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index a04a7e45c62..9de744013d3 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -717,7 +717,7 @@ def flash_error(message: Any, allow_html: bool = False) -> None:
         message = Markup(message)
     else:
         message = escape(message)
-    flash(message, category='alert-error')
+    flash(message, category='alert-danger')
 
 
 @core_helper
diff --git a/ckan/templates/group/snippets/info.html b/ckan/templates/group/snippets/info.html
index b8d16afdcb8..6aea336904b 100644
--- a/ckan/templates/group/snippets/info.html
+++ b/ckan/templates/group/snippets/info.html
@@ -51,7 +51,7 @@ <h1 class="heading">
       {% block follow %}
         {% if current_user.is_authenticated %}
           {% if error_message %}
-            <div class="alert alert-error">{{ error_message }}</div>
+            <div class="alert alert-danger">{{ error_message }}</div>
           {% endif %}
           {% if am_following %}
             <a class="btn btn-danger" hx-post="{{ h.url_for('group.unfollow', id=group.id) }}" hx-target="#group-info"><i class="fa-solid fa-circle-minus"></i> Unfollow</a>
diff --git a/ckan/templates/organization/snippets/info.html b/ckan/templates/organization/snippets/info.html
index 2bf5bf5db1b..d0e4978a18f 100644
--- a/ckan/templates/organization/snippets/info.html
+++ b/ckan/templates/organization/snippets/info.html
@@ -62,7 +62,7 @@ <h1 class="heading">{{ organization.title or organization.name }}
         {% block follow %}
         {% if current_user.is_authenticated %}
           {% if error_message %}
-            <div class="alert alert-error">{{ error_message }}</div>
+            <div class="alert alert-danger">{{ error_message }}</div>
           {% elif am_following %}
             <a class="btn btn-danger" hx-post="{{ h.url_for('organization.unfollow', id=organization.id) }}" hx-target="#organization-info"><i class="fa-solid fa-circle-minus"></i> Unfollow</a>
           {% else %}
diff --git a/ckan/templates/package/snippets/info.html b/ckan/templates/package/snippets/info.html
index 619d45c9d42..5522ccb138b 100644
--- a/ckan/templates/package/snippets/info.html
+++ b/ckan/templates/package/snippets/info.html
@@ -30,7 +30,7 @@ <h1 class="heading">{{ h.dataset_display_name(pkg) }}</h1>
             {% block follow_button %}
               {% if current_user.is_authenticated %}
                {% if error_message %}
-                  <div class="alert alert-error">{{ error_message }}</div>
+                  <div class="alert alert-danger">{{ error_message }}</div>
                 {% endif %}
                {% if am_following %}
                   <a class="btn btn-danger" hx-post="{{ h.url_for('dataset.unfollow', id=pkg.id) }}" hx-target="#package-info"><i class="fa-solid fa-circle-minus"></i> Unfollow</a>
diff --git a/ckan/templates/user/snippets/info.html b/ckan/templates/user/snippets/info.html
index d27f35d13f5..7ba9aca6915 100644
--- a/ckan/templates/user/snippets/info.html
+++ b/ckan/templates/user/snippets/info.html
@@ -58,7 +58,7 @@ <h1 class="heading">{{ user.display_name }}</h1>
           {% block user_follow %}
           {% if current_user.is_authenticated %}
           {% if error_message %}
-             <div class="alert alert-error">{{ error_message }}</div>
+             <div class="alert alert-danger">{{ error_message }}</div>
           {% endif %}
           {% if am_following %}
              <a class="btn btn-danger" hx-post="{{ h.url_for('user.unfollow', id=user.id) }}" hx-target="#user-info"><i class="fa-solid fa-circle-minus"></i> Unfollow</a>
@@ -109,4 +109,4 @@ <h1 class="heading">{{ user.display_name }}</h1>
         {% endblock %}
       {% endblock %}
     </section>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/ckanext/datapusher/templates/datapusher/resource_data.html b/ckanext/datapusher/templates/datapusher/resource_data.html
index d8928d3e9d4..19e3098e00d 100644
--- a/ckanext/datapusher/templates/datapusher/resource_data.html
+++ b/ckanext/datapusher/templates/datapusher/resource_data.html
@@ -8,7 +8,7 @@
   {% set show_table = true %}
 
   <form method="post" action="{{ action }}" class="datapusher-form">
-    {{ h.csrf_input() }} 
+    {{ h.csrf_input() }}
     <button class="btn btn-primary" name="save" type="submit">
       <i class="fa fa-cloud-upload"></i> {{ _('Upload to DataStore') }}
     </button>
@@ -16,11 +16,11 @@
 
   {% if status.error and status.error.message %}
     {% set show_table = false %}
-    <div class="alert alert-error">
+    <div class="alert alert-danger">
       <strong>{{ _('Upload error:') }}</strong> {{ status.error.message }}
     </div>
   {% elif status.task_info and status.task_info.error %}
-    <div class="alert alert-error">
+    <div class="alert alert-danger">
       {% if status.task_info.error is string %}
         {# DataPusher < 0.0.3 #}
         <strong>{{ _('Error:') }}</strong> {{ status.task_info.error }}
@@ -76,7 +76,7 @@ <h3>{{ _('Upload Log') }}</h3>
           {% endfor %}
           <span class="date" title="{{ h.render_datetime(item.timestamp, with_hours=True) }}">
             {{ h.time_ago_from_timestamp(item.timestamp) }}
-            <a href="#" data-module="datapusher_popover" data-module-title="Details <a href='#' class='popover-close'>X</a>" data-module-content="<ul class='list-unstyled'>{% for key, value in item.items() %}<li><b>{{ key }}</b>: {{ h.clean_html(value|string) }}</li>{% endfor %}</ul>">              
+            <a href="#" data-module="datapusher_popover" data-module-title="Details <a href='#' class='popover-close'>X</a>" data-module-content="<ul class='list-unstyled'>{% for key, value in item.items() %}<li><b>{{ key }}</b>: {{ h.clean_html(value|string) }}</li>{% endfor %}</ul>">
               {{ _('Details') }}
             </a>
           </span>

From e31c9510493b433c544313a6529e72dc84c5a486 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Wed, 8 Nov 2023 18:42:20 +0000
Subject: [PATCH 2/2] feat(dev): added changelog;

- Added change log file.
---
 changes/7901.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/7901.bugfix

diff --git a/changes/7901.bugfix b/changes/7901.bugfix
new file mode 100644
index 00000000000..ef0128fc31a
--- /dev/null
+++ b/changes/7901.bugfix
@@ -0,0 +1 @@
+Updated Bootstrap alert-error class to alert-danger.