From 5e611f54cb5c7404c355aae415f42a2b26860a9b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <KangOl@users.noreply.github.com>
Date: Fri, 28 Jun 2019 11:31:06 +0200
Subject: [PATCH] [IMP] runbot_merge: allow sorting & deactivating branches

Closes #144, closes #145
---
 runbot_merge/models/pull_requests.py | 5 +++++
 runbot_merge/views/mergebot.xml      | 4 +++-
 runbot_merge/views/templates.xml     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py
index be57f995..33f0636e 100644
--- a/runbot_merge/models/pull_requests.py
+++ b/runbot_merge/models/pull_requests.py
@@ -32,6 +32,7 @@ class Project(models.Model):
     )
     branch_ids = fields.One2many(
         'runbot_merge.branch', 'project_id',
+        context={'active_test': False},
         help="Branches of all project's repos which are managed by the merge bot. Also "\
         "target branches of PR this project handles."
     )
@@ -232,6 +233,7 @@ class Repository(models.Model):
 
 class Branch(models.Model):
     _name = 'runbot_merge.branch'
+    _order = 'sequence, name'
 
     name = fields.Char(required=True)
     project_id = fields.Many2one('runbot_merge.project', required=True)
@@ -248,6 +250,9 @@ class Branch(models.Model):
         ('state', '!=', 'merged'),
     ])
 
+    active = fields.Boolean(default=True)
+    sequence = fields.Integer()
+
     def _auto_init(self):
         res = super(Branch, self)._auto_init()
         tools.create_unique_index(
diff --git a/runbot_merge/views/mergebot.xml b/runbot_merge/views/mergebot.xml
index 8a63cdc0..b1af5357 100644
--- a/runbot_merge/views/mergebot.xml
+++ b/runbot_merge/views/mergebot.xml
@@ -42,8 +42,10 @@
                     </field>
                     <separator string="Branches"/>
                     <field name="branch_ids">
-                        <tree editable="bottom">
+                        <tree editable="bottom" decoration-muted="not active">
+                            <field name="sequence" widget="handle" />
                             <field name="name"/>
+                            <field name="active"/>
                         </tree>
                     </field>
                 </sheet>
diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml
index 773c9c10..70d6e9b1 100644
--- a/runbot_merge/views/templates.xml
+++ b/runbot_merge/views/templates.xml
@@ -44,7 +44,7 @@
                             <li class="bg-gray-lighter">cancelled</li>
                         </ul>
                     </div>
-                    <section t-foreach="project.branch_ids" t-as="branch" class="col-md-12">
+                    <section t-foreach="project.branch_ids" t-as="branch" t-if="branch.active" class="col-md-12">
                         <h2><t t-esc="branch.name"/></h2>
                         <t t-call="runbot_merge.stagings"/>
                         <t t-set="ready_unstaged" t-value="