NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: provide explicit labels on fields

Browse Source 
Two fields can't have the same label, because of the field names,
there were field label conflicts.
This commit is contained in:
Xavier Morel 2020-01-13 08:43:10 +01:00
parent 0bdc824c2e
commit 27e9a4f9ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot_merge/models/pull_requests.py
View File

@ -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='{}')

2
runbot_merge/models/res_partner.py
View File

@ -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()