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

[IMP] runbot_merge: move limit to fwport tab

Browse Source 
And filter it to only consider branches in the same project as the PR,
and a lower sequence than its target. That way it's harder to fuck up
when trying to set limits from the backend.
This commit is contained in:
Xavier Morel 2024-06-12 15:30:44 +02:00
parent d010f0374a
commit a2d7180216
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot_merge/models/pull_requests.py
View File

@ -323,7 +323,9 @@ class PullRequests(models.Model):
display_name: str
target = fields.Many2one('runbot_merge.branch', required=True, index=True, tracking=True)
target_sequence = fields.Integer(related='target.sequence')
repository = fields.Many2one('runbot_merge.repository', required=True)
project = fields.Many2one(related='repository.project_id')
# NB: check that target & repo have same project & provide project related?
closed = fields.Boolean(default=False, tracking=True)

4
runbot_merge/views/mergebot.xml
View File

@ -129,6 +129,8 @@
<field name="url" widget="url" class="btn btn-secondary" text="Frontend"/></span>
</div>
<sheet>
<field name="project" invisible="1"/>
<field name="target_sequence" invisible="1"/>
<div class="oe_title">
<h1>
<field name="repository"/>#<field name="number"/>
@ -187,7 +189,6 @@
<field name="merge_method"/>
<field name="squash"/>
<field name="draft"/>
<field name="limit_id"/>
</group>
<group>
<field name="priority"/>
@ -224,6 +225,7 @@
<page name="porting" string="Forward-Porting">
<group>
<group>
<field name="limit_id" domain="[('project_id', '=', project), ('sequence', '&lt;=', target_sequence)]"/>
<field string="Original PR" name="source_id"/>
<field name="parent_id"/>
<field