From 27e9a4f9eec988222f0e705979caa5042631834d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 13 Jan 2020 08:43:10 +0100 Subject: [PATCH] [FIX] runbot_merge: provide explicit labels on fields Two fields can't have the same label, because of the field names, there were field label conflicts. --- runbot_merge/models/pull_requests.py | 4 ++-- runbot_merge/models/res_partner.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index eaedbb00..8ee7cb50 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -554,8 +554,8 @@ class PullRequests(models.Model): status = fields.Char(compute='_compute_statuses') previous_failure = fields.Char(default='{}') - batch_id = fields.Many2one('runbot_merge.batch',compute='_compute_active_batch', store=True) - batch_ids = fields.Many2many('runbot_merge.batch') + batch_id = fields.Many2one('runbot_merge.batch', string="Active Batch", compute='_compute_active_batch', store=True) + batch_ids = fields.Many2many('runbot_merge.batch', string="Batches") staging_id = fields.Many2one(related='batch_id.staging_id', store=True) commits_map = fields.Char(help="JSON-encoded mapping of PR commits to actually integrated commits. The integration head (either a merge commit or the PR's topmost) is mapped from the 'empty' pr commit (the key is an empty string, because you can't put a null key in json maps).", default='{}') diff --git a/runbot_merge/models/res_partner.py b/runbot_merge/models/res_partner.py index e170e80c..6fddbb06 100644 --- a/runbot_merge/models/res_partner.py +++ b/runbot_merge/models/res_partner.py @@ -8,7 +8,7 @@ class Partner(models.Model): reviewer = fields.Boolean(default=False, help="Can review PRs (maybe m2m to repos/branches?)") self_reviewer = fields.Boolean(default=False, help="Can review own PRs (independent from reviewer)") delegate_reviewer = fields.Many2many('runbot_merge.pull_requests') - formatted_email = fields.Char(compute='_rfc5322_formatted') + formatted_email = fields.Char(string="commit email", compute='_rfc5322_formatted') def _auto_init(self): res = super(Partner, self)._auto_init()