Merge branch '590-pdf-files-offered-for-download-despite-of-error' into 'master'

Resolve "PDF files offered for download despite of error"

Closes #590

See merge request !848

CHANGELOG.rst

@@ -15,6 +15,7 @@ Fixed
 * Remove left-over reference to preferences in a form definition that caused
   form extensions in downstream apps to break
 * Allow non-LDAP users to authenticate if LDAP is used with password handling
+* Additional button on progress page for background tasks was shown even if the task failed.
 
 `2.4`_ – 2021-12-24
 -------------------

aleksis/core/static/js/progress.js

@@ -47,6 +47,7 @@ function customSuccess(progressBarElement, progressBarMessageElement) {
     $("#result-icon").text("check_circle");
     $("#result-text").text(OPTIONS.success);
     $("#result-box").show();
+    $("#result-button").show();
     const redirect = "redirect_on_success" in OPTIONS && OPTIONS.redirect_on_success;
     if (redirect) {
         window.location.replace(OPTIONS.redirect_on_success);

aleksis/core/templates/core/pages/progress.html

@@ -47,7 +47,7 @@
           {% trans "Go back" %}
         </a>
         {% if additional_button %}
-          <a class="btn waves-effect waves-light" href="{{ additional_button.href }}">
+          <a class="btn waves-effect waves-light" href="{{ additional_button.href }}" id="result-button" style="display: none;">
             <i class="material-icons left">{{ additional_button.icon|default:"" }}</i>
             {{ additional_button.caption }}
           </a>