From 974bab40ba6cd84c04d6cdd44cbdd6374ae5db7f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Thu, 12 Mar 2020 11:05:49 +0100
Subject: [PATCH] [IMP] runbot_merge: add style for successful but unmerged
 staging

Currently the PR becomes successful-green as soon as CI fully passes
but before it's merged, which can be an issue as e.g. merging might be
delayed (there's no visible difference between "CI success" and
"staging merged") or it might ultimately failed (FF error).

Create an intermediate color for "successful" stagings which are still
pending merge.

Also add a fallback message for fast-forward errors instead of en
empty string.

Closes #308
---
 runbot_merge/static/scss/runbot_merge.scss | 3 +++
 runbot_merge/views/templates.xml           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/runbot_merge/static/scss/runbot_merge.scss b/runbot_merge/static/scss/runbot_merge.scss
index 33d60d86..97ce8693 100644
--- a/runbot_merge/static/scss/runbot_merge.scss
+++ b/runbot_merge/static/scss/runbot_merge.scss
@@ -18,6 +18,9 @@ h5 { font-size: 1em; }
 .bg-success {
   background-color: #dff0d8 !important;
 }
+.bg-unmerged {
+  background-color: #dcefe8 !important
+}
 .bg-info {
   background-color: #d9edf7 !important;
 }
diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml
index 68c51988..6bc65334 100644
--- a/runbot_merge/views/templates.xml
+++ b/runbot_merge/views/templates.xml
@@ -121,7 +121,7 @@
                 <t t-set="failure" t-value="staging.state == 'failure'"/>
                 <t t-set="pending" t-value="staging.active and (not staging.state or staging.state == 'pending')"/>
                 <t t-set="stateclass">
-                    <t t-if="success">bg-success</t>
+                    <t t-if="success">bg-success <t t-if="staging.active">bg-unmerged</t></t>
                     <t t-if="failure">bg-danger</t>
                     <t t-if="pending">bg-info</t>
                     <t t-if="not (success or failure or pending)">bg-gray-lighter</t>