From 0826b3484bae4189402e78159a0384b59f5b1683 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 25 Aug 2023 09:51:37 +0200 Subject: [PATCH] [ADD] runbot_merge: view improvements - add formatting for a bunch of backend objects - add cross-links in order to use toplevel navigation between objects e.g. project -> branch -> staging -> PR with breadcrumbs instead of shitty dialog boxes Relates to #802 --- runbot_merge/models/pull_requests.py | 4 + runbot_merge/views/mergebot.xml | 98 +++++++++++++++++++-- runbot_merge/views/runbot_merge_project.xml | 2 + 3 files changed, 96 insertions(+), 8 deletions(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index ed50d02b..ba8ac7f7 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -1716,6 +1716,10 @@ class Commit(models.Model): statuses = fields.Char(help="json-encoded mapping of status contexts to states", default="{}") to_check = fields.Boolean(default=False) + head_ids = fields.Many2many('runbot_merge.stagings', relation='runbot_merge_stagings_heads', column2='staging_id', column1='commit_id') + commit_ids = fields.Many2many('runbot_merge.stagings', relation='runbot_merge_stagings_commits', column2='staging_id', column1='commit_id') + + def create(self, values): values['to_check'] = True r = super(Commit, self).create(values) diff --git a/runbot_merge/views/mergebot.xml b/runbot_merge/views/mergebot.xml index ab5c8ee4..a05fcc57 100644 --- a/runbot_merge/views/mergebot.xml +++ b/runbot_merge/views/mergebot.xml @@ -20,6 +20,7 @@ +