From 3b0a794c7b5f607bf0f643d3008c1e83cd20b844 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 18 Jun 2018 10:08:48 +0200 Subject: [PATCH] [ADD] runbot_merge: trivial dashboard --- runbot_merge/__manifest__.py | 3 +- .../__init__.py} | 2 ++ runbot_merge/controllers/dashboard.py | 10 ++++++ runbot_merge/models/pull_requests.py | 7 +++- runbot_merge/views/templates.xml | 36 +++++++++++++++++++ 5 files changed, 56 insertions(+), 2 deletions(-) rename runbot_merge/{controllers.py => controllers/__init__.py} (99%) create mode 100644 runbot_merge/controllers/dashboard.py create mode 100644 runbot_merge/views/templates.xml diff --git a/runbot_merge/__manifest__.py b/runbot_merge/__manifest__.py index 35eb3fa0..9b6a4e73 100644 --- a/runbot_merge/__manifest__.py +++ b/runbot_merge/__manifest__.py @@ -1,9 +1,10 @@ { 'name': 'merge bot', - 'depends': ['contacts'], + 'depends': ['contacts', 'website'], 'data': [ 'data/merge_cron.xml', 'views/res_partner.xml', 'views/mergebot.xml', + 'views/templates.xml', ] } diff --git a/runbot_merge/controllers.py b/runbot_merge/controllers/__init__.py similarity index 99% rename from runbot_merge/controllers.py rename to runbot_merge/controllers/__init__.py index e9b6b381..0a8b52c9 100644 --- a/runbot_merge/controllers.py +++ b/runbot_merge/controllers/__init__.py @@ -7,6 +7,8 @@ import werkzeug.exceptions from odoo.http import Controller, request, route +from . import dashboard + _logger = logging.getLogger(__name__) class MergebotController(Controller): diff --git a/runbot_merge/controllers/dashboard.py b/runbot_merge/controllers/dashboard.py new file mode 100644 index 00000000..4d5f0d2e --- /dev/null +++ b/runbot_merge/controllers/dashboard.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +from odoo.http import Controller, route, request + + +class MergebotDashboard(Controller): + @route('/runbot_merge', auth="public", type="http", website=True) + def dashboard(self): + return request.render('runbot_merge.dashboard', { + 'projects': request.env['runbot_merge.project'].sudo().search([]), + }) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 2f31efd1..54bfb46b 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -343,6 +343,11 @@ class Branch(models.Model): ) staging_ids = fields.One2many('runbot_merge.stagings', 'target') + prs = fields.One2many('runbot_merge.pull_requests', 'target', domain=[ + ('state', '!=', 'closed'), + ('state', '!=', 'merged'), + ]) + def _auto_init(self): res = super(Branch, self)._auto_init() tools.create_unique_index( @@ -380,7 +385,7 @@ class PullRequests(models.Model): message = fields.Text(required=True) squash = fields.Boolean(default=False) - delegates = fields.Many2many('res.partner', help="Delegate reviewers, not intrisically reviewers but can review this PR") + delegates = fields.Many2many('res.partner', help="Delegate reviewers, not intrinsically reviewers but can review this PR") priority = fields.Selection([ (0, 'Urgent'), (1, 'Pressing'), diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml new file mode 100644 index 00000000..a1bdcbda --- /dev/null +++ b/runbot_merge/views/templates.xml @@ -0,0 +1,36 @@ + + + +