From 884306428e546f862a1be7f66835b09260e2e56d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Thu, 13 Mar 2025 12:21:21 +0100
Subject: [PATCH] [FIX] runbot_merge: avoid disappearing closed batches from
 stagings

This is only a temporary / partial fix (see #1100 for further issues)
but it solves the most obvious problem of a batch having a single PR,
being staged, the staging fails, the PR gets closed, and the batch
disappearing from the staging.

The issue remains that stagings don't actually reflect the state as of
the staging, since they link to the updated version of batches rather
than the version as of staging. That probably can't be fixed if we
want to keep track of everything *but* for documentary and display
purposes the staging should store the state of batches and
PRs (e.g. as JSON) as of its creation.

Fixes #1079
---
 runbot_merge/views/templates.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml
index 30430c23..a6f1b681 100644
--- a/runbot_merge/views/templates.xml
+++ b/runbot_merge/views/templates.xml
@@ -195,10 +195,18 @@
                 </t>
                 <li t-attf-class="staging {{stateclass.strip()}} {{decorationclass.strip()}}" t-att-title="title.strip() or None">
                     <ul class="list-unstyled">
-                        <li t-foreach="staging.batch_ids" t-as="batch" class="batch">
-                            <t t-esc="batch.prs[:1].label"/>
-                            <t t-foreach="batch.prs" t-as="pr">
-                                <t t-call="runbot_merge.link-pr"/>
+                        <li t-foreach="staging.batch_ids" t-as="batch"
+                            t-attf-class="batch {{'' if batch.active else 'text-decoration-line-through'}}">
+                            <t t-esc="batch.name"/>
+                            <t t-if="batch.active">
+                                <t t-foreach="batch.prs" t-as="pr">
+                                    <t t-call="runbot_merge.link-pr"/>
+                                </t>
+                            </t>
+                            <t t-else="">
+                                <t t-foreach="batch.all_prs" t-as="pr">
+                                    <t t-call="runbot_merge.link-pr"/>
+                                </t>
                             </t>
                         </li>
                     </ul>