diff --git a/runbot_merge/__manifest__.py b/runbot_merge/__manifest__.py index fff46f02..82978d76 100644 --- a/runbot_merge/__manifest__.py +++ b/runbot_merge/__manifest__.py @@ -21,6 +21,7 @@ 'runbot_merge/static/scss/runbot_merge.scss', ], 'web.assets_backend': [ + 'runbot_merge/static/scss/runbot_merge_backend.scss', 'runbot_merge/static/project_freeze/index.js', ], }, diff --git a/runbot_merge/models/project_freeze/__init__.py b/runbot_merge/models/project_freeze/__init__.py index c6718883..73889ae7 100644 --- a/runbot_merge/models/project_freeze/__init__.py +++ b/runbot_merge/models/project_freeze/__init__.py @@ -6,6 +6,8 @@ import logging import time from collections import Counter +from markupsafe import Markup + from odoo import models, fields, api, Command from odoo.exceptions import UserError from odoo.addons.runbot_merge.exceptions import FastForwardError @@ -25,6 +27,17 @@ class FreezeWizard(models.Model): help="Pull requests which must have been merged before the freeze is allowed", ) + pr_state_key = fields.Html(string="Color Key", compute='_compute_state_key', readonly=True) + def _compute_state_key(self): + s = dict(self.env['runbot_merge.pull_requests']._fields['state'].selection) + self.pr_state_key = Markup(""" +
%s
+ """) % Markup(" ").join( + Markup('{}').format(v, s[k]) + for k, v in STATE_COLORMAP.items() + if v + ) + release_label = fields.Char( string="Find by label", help="Setting a (complete) PR label will automatically find and " @@ -411,7 +424,7 @@ STATE_COLORMAP = { 'merged': Colors.Green, 'error': Colors.Red, } -class PullRequestColor(models.Model): +class PullRequest(models.Model): _inherit = 'runbot_merge.pull_requests' state_color = fields.Integer(compute='_compute_state_color') diff --git a/runbot_merge/models/project_freeze/views.xml b/runbot_merge/models/project_freeze/views.xml index 07c06038..ecbcc35c 100644 --- a/runbot_merge/models/project_freeze/views.xml +++ b/runbot_merge/models/project_freeze/views.xml @@ -14,6 +14,7 @@