From c693a7f84187bbbf03db32ec350bb8e9089728a4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 1 Mar 2019 17:29:37 +0100 Subject: [PATCH] [ADD] runbot_merge: button to manually cancel stagings This is somewhat less useful with runbot's fail-fast as a runbot failure (false positive or not) will now very quickly trigger an end to the current staging. Still, could be of use. closes #89 --- runbot_merge/models/pull_requests.py | 6 +++++- runbot_merge/views/mergebot.xml | 31 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 0ceaaf56..94055443 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -1114,10 +1114,14 @@ class Stagings(models.Model): s.state = st - def cancel(self, reason, *args): + @api.multi + def cancel(self, reason=None, *args): if not self: return + if reason is None: + reason = "explicitly cancelled by %s" + args = [self.env.user.display_name] _logger.info("Cancelling staging %s: " + reason, self, *args) self.batch_ids.write({'active': False}) self.write({ diff --git a/runbot_merge/views/mergebot.xml b/runbot_merge/views/mergebot.xml index 7ada3aef..8a63cdc0 100644 --- a/runbot_merge/views/mergebot.xml +++ b/runbot_merge/views/mergebot.xml @@ -182,6 +182,37 @@ + + Stagings Form + runbot_merge.stagings + +
+
+
+ + + + + + + + + + + + + + + + + + + + +
+
+
PRs to fetch