From 1dcea28f453a52d6f22f18960afbd8955eabcfd1 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Thu, 2 Jan 2020 16:57:51 +0100 Subject: [PATCH] [FIX] runbot: make field name unique --- runbot/models/branch.py | 2 +- runbot/models/build.py | 4 ++-- runbot/models/build_config.py | 2 +- runbot/models/repo.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runbot/models/branch.py b/runbot/models/branch.py index 330b0856..136c6d31 100644 --- a/runbot/models/branch.py +++ b/runbot/models/branch.py @@ -36,7 +36,7 @@ class runbot_branch(models.Model): no_auto_build = fields.Boolean("Don't automatically build commit on this branch", default=False) rebuild_requested = fields.Boolean("Request a rebuild", help="Rebuild the latest commit even when no_auto_build is set.", default=False) - branch_config_id = fields.Many2one('runbot.build.config', 'Run Config') + branch_config_id = fields.Many2one('runbot.build.config', 'Branch Config') config_id = fields.Many2one('runbot.build.config', 'Run Config', compute='_compute_config_id', inverse='_inverse_config_id') @api.depends('sticky', 'defined_sticky', 'target_branch_name', 'name') diff --git a/runbot/models/build.py b/runbot/models/build.py index 8d7da4e4..c9abd96d 100644 --- a/runbot/models/build.py +++ b/runbot/models/build.py @@ -66,7 +66,7 @@ class runbot_build(models.Model): nb_pending = fields.Integer("Number of pending in queue", default=0) nb_testing = fields.Integer("Number of test slot use", default=0) - nb_running = fields.Integer("Number of test slot use", default=0) + nb_running = fields.Integer("Number of run slot use", default=0) # should we add a stored field for children results? active_step = fields.Many2one('runbot.build.config.step', 'Active step') @@ -76,7 +76,7 @@ class runbot_build(models.Model): build_start = fields.Datetime('Build start') build_end = fields.Datetime('Build end') job_time = fields.Integer(compute='_compute_job_time', string='Job time') - build_time = fields.Integer(compute='_compute_build_time', string='Job time') + build_time = fields.Integer(compute='_compute_build_time', string='Build time') build_age = fields.Integer(compute='_compute_build_age', string='Build age') duplicate_id = fields.Many2one('runbot.build', 'Corresponding Build', index=True) revdep_build_ids = fields.Many2many('runbot.build', 'runbot_rev_dep_builds', diff --git a/runbot/models/build_config.py b/runbot/models/build_config.py index 0dac6010..17700158 100644 --- a/runbot/models/build_config.py +++ b/runbot/models/build_config.py @@ -30,7 +30,7 @@ class Config(models.Model): update_github_state = fields.Boolean('Notify build state to github', default=False, track_visibility='onchange') protected = fields.Boolean('Protected', default=False, track_visibility='onchange') group = fields.Many2one('runbot.build.config', 'Configuration group', help="Group of config's and config steps") - group_name = fields.Char(related='group.name') + group_name = fields.Char('Group name', related='group.name') @api.model def create(self, values): diff --git a/runbot/models/repo.py b/runbot/models/repo.py index 0acad0b0..54801b73 100644 --- a/runbot/models/repo.py +++ b/runbot/models/repo.py @@ -34,7 +34,7 @@ class runbot_repo(models.Model): _order = 'sequence, id' name = fields.Char('Repository', required=True) - short_name = fields.Char('Repository', compute='_compute_short_name', store=False, readonly=True) + short_name = fields.Char('Short name', compute='_compute_short_name', store=False, readonly=True) sequence = fields.Integer('Sequence') path = fields.Char(compute='_get_path', string='Directory', readonly=True) base = fields.Char(compute='_get_base_url', string='Base URL', readonly=True) # Could be renamed to a more explicit name like base_url @@ -61,7 +61,7 @@ class runbot_repo(models.Model): token = fields.Char("Github token", groups="runbot.group_runbot_admin") group_ids = fields.Many2many('res.groups', string='Limited to groups') - repo_config_id = fields.Many2one('runbot.build.config', 'Run Config') + repo_config_id = fields.Many2one('runbot.build.config', 'Repo Config') config_id = fields.Many2one('runbot.build.config', 'Run Config', compute='_compute_config_id', inverse='_inverse_config_id') server_files = fields.Char('Server files', help='Comma separated list of possible server files') # odoo-bin,openerp-server,openerp-server.py