From b8408546a08400db4789a45bebe0d74ddafc889c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Wed, 29 Jul 2020 08:42:56 +0200
Subject: [PATCH] [FIX] runbot_merge: stagings dashboard

Mistake in the statuses handling: the context is not sufficient to
uniquely identify a staging status as different repositories can get
the same status context (e.g. ci/runbot is present on all our
repositories).

This is only a visual problem, but the status dropdown on
stagings (both the dashboard and the branchwise listing) would reuse
one of the status with the context for all of them, leading to
incorrect links and misleading displays.

Fix by keying on (repo, context) instead, that's exactly why the
repository name was part of the status in the first place.
---
 runbot_merge/views/templates.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml
index 9fb8542c..3879c6f3 100644
--- a/runbot_merge/views/templates.xml
+++ b/runbot_merge/views/templates.xml
@@ -159,9 +159,9 @@
                                     </a>
                                 </li>
 
-                                <t t-set="statuses" t-value="{c: (s, t) for h, c, s, t in staging.statuses}"/>
+                                <t t-set="statuses" t-value="{(r, c): (s, t) for r, c, s, t in staging.statuses}"/>
                                 <t t-foreach="repo_statuses._for_staging(staging)" t-as="req">
-                                    <t t-set="st" t-value="statuses.get(req.context) or ('pending', None)"/>
+                                    <t t-set="st" t-value="statuses.get((req.repo_id.name, req.context)) or ('pending', None)"/>
                                     <li t-att-class="
                                             'bg-success' if st[0] == 'success'
                                        else 'bg-danger' if st[0] in ('error', 'failure')
@@ -237,10 +237,9 @@
                                                 Open Staging
                                             </a>
                                         </li>
-
-                                        <t t-set="statuses" t-value="{c: (s, t) for h, c, s, t in staging.statuses}"/>
+                                        <t t-set="statuses" t-value="{(r, c): (s, t) for r, c, s, t in staging.statuses}"/>
                                         <t t-foreach="repo_statuses._for_staging(staging)" t-as="req">
-                                            <t t-set="st" t-value="statuses.get(req.context) or ('pending', None)"/>
+                                            <t t-set="st" t-value="statuses.get((req.repo_id.name, req.context)) or ('pending', None)"/>
                                             <li t-att-class="
                                                     'bg-success' if st[0] == 'success'
                                                else 'bg-danger' if st[0] in ('error', 'failure')