canonical-ubuntu-qa team mailing list archive

[Ural Tunaboyu <mp+470271@xxxxxxxxxxxxxxxxxx>]

Ural Tunaboyu has proposed merging ~uralt/autopkgtest-cloud:retry-macro-fix into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~uralt/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/470271

Adding some parameters to the new retry_button macro that I had missed the first time around.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~uralt/autopkgtest-cloud:retry-macro-fix into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/macros.html b/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
index e3cd98f..d7a1a21 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
@@ -129,7 +129,7 @@
     {% endif %}
   </td>
   <td class="nowrap">
-    {% if show_retry %}{{ retry_button(triggers, all_proposed) }}{% endif %}
+    {% if show_retry %}{{ retry_button(release, arch, package, triggers, all_proposed) }}{% endif %}
   </td>
 {%- endmacro %}
 
@@ -149,7 +149,7 @@
   Launchpad</a>
 {%- endmacro %}
 
-{% macro retry_button(triggers, all_proposed) -%}
+{% macro retry_button(release, arch, package, triggers, all_proposed) -%}
   {% set ts = triggers.split()|map('urlencode')|join("&trigger=")|safe %}
   {% if all_proposed %}
     <a href="{{ url_for("index_root") }}request.cgi?release={{ release }}&arch={{ arch }}&package={{ package|urlencode }}&trigger={{ ts }}&all-proposed=1">&#9851;</a>