canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+467784@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:fix-retry-url into autopkgtest-cloud:master.

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

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/467784
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:fix-retry-url into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/browse-results.html b/charms/focal/autopkgtest-web/webcontrol/templates/browse-results.html
index b211bf2..2b79b21 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/browse-results.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/browse-results.html
@@ -19,7 +19,7 @@
 
   {% for row in package_results %}
     <tr {% if row[6] in ["running", "queued"] %}class="unfinished"{% endif %}>
-      {{ macros.results_table_core(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10]) }}
+      {{ macros.results_table_core(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10], package, release, arch) }}
     </tr>
   {% endfor %}
   </table>
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/browse-user.html b/charms/focal/autopkgtest-web/webcontrol/templates/browse-user.html
index 99b2cd5..63edd55 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/browse-user.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/browse-user.html
@@ -18,7 +18,7 @@
       <td>{{ package }}</td>
       <td>{{ release }}</td>
       <td>{{ arch }}</td>
-      {{ macros.results_table_core(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10]) }}
+      {{ macros.results_table_core(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10], package, release, arch) }}
     </tr>
   {% endfor %}
   </table>
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/macros.html b/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
index 36809a4..8595568 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
@@ -61,7 +61,7 @@
   <td></td>
 {%- endmacro %}
 
-{% macro results_table_core(version, triggers, env, date, duration, requester, code, url, show_retry, all_proposed, uuid) -%}
+{% macro results_table_core(version, triggers, env, date, duration, requester, code, url, show_retry, all_proposed, uuid, package, release, arch) -%}
   <td>{{ version }}</td>
   <td>{{ triggers }}</td>
   <td>{{ env }}</td>
@@ -86,9 +86,9 @@
     {% if show_retry %}
       {% set ts = triggers.split()|map('urlencode')|join("&trigger=")|safe %}
       {% if all_proposed %}
-        <a href="{{ base_url }}request.cgi?release={{ release }}&arch={{ arch }}&package={{ package|urlencode }}&trigger={{ ts }}&all-proposed=1">&#9851;</a>
+        <a href="{{ url_for('index_root') }}request.cgi?release={{ release }}&arch={{ arch }}&package={{ package|urlencode }}&trigger={{ ts }}&all-proposed=1">&#9851;</a>
       {% else %}
-        <a href="{{ base_url }}request.cgi?release={{ release }}&arch={{ arch }}&package={{ package|urlencode }}&trigger={{ ts }}">&#9851;</a>
+        <a href="{{ url_for('index_root') }}request.cgi?release={{ release }}&arch={{ arch }}&package={{ package|urlencode }}&trigger={{ ts }}">&#9851;</a>
       {% endif %}
     {% endif %}
   </td>