diff --git a/forwardport/models/project.py b/forwardport/models/project.py index 3302aa43..f9389b5d 100644 --- a/forwardport/models/project.py +++ b/forwardport/models/project.py @@ -218,7 +218,7 @@ class Repository(models.Model): class Branch(models.Model): _inherit = 'runbot_merge.branch' - fp_sequence = fields.Integer(default=50) + fp_sequence = fields.Integer(default=50, group_operator=None) fp_target = fields.Boolean(default=True) fp_enabled = fields.Boolean(compute='_compute_fp_enabled') @@ -238,7 +238,7 @@ class PullRequests(models.Model): ) source_id = fields.Many2one('runbot_merge.pull_requests', index=True, help="the original source of this FP even if parents were detached along the way") forwardport_ids = fields.One2many('runbot_merge.pull_requests', 'source_id') - reminder_backoff_factor = fields.Integer(default=-4) + reminder_backoff_factor = fields.Integer(default=-4, group_operator=None) merge_date = fields.Datetime() fw_policy = fields.Selection([ diff --git a/runbot_merge/models/project.py b/runbot_merge/models/project.py index f7296dc8..fb46c33f 100644 --- a/runbot_merge/models/project.py +++ b/runbot_merge/models/project.py @@ -21,7 +21,7 @@ class Project(models.Model): ) ci_timeout = fields.Integer( - default=60, required=True, + default=60, required=True, group_operator=None, help="Delay (in minutes) before a staging is considered timed out and failed" ) @@ -34,7 +34,7 @@ class Project(models.Model): ) batch_limit = fields.Integer( - default=8, help="Maximum number of PRs staged together") + default=8, group_operator=None, help="Maximum number of PRs staged together") secret = fields.Char( help="Webhook secret. If set, will be checked against the signature " diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 8d5dcd89..844ca04a 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -64,7 +64,7 @@ class Repository(models.Model): _name = _description = 'runbot_merge.repository' _order = 'sequence, id' - sequence = fields.Integer(default=50) + sequence = fields.Integer(default=50, group_operator=None) name = fields.Char(required=True) project_id = fields.Many2one('runbot_merge.project', required=True) status_ids = fields.One2many('runbot_merge.repository.status', 'repo_id', string="Required Statuses") @@ -240,7 +240,7 @@ class Branch(models.Model): ]) active = fields.Boolean(default=True) - sequence = fields.Integer() + sequence = fields.Integer(group_operator=None) def _auto_init(self): res = super(Branch, self)._auto_init() @@ -509,7 +509,7 @@ class PullRequests(models.Model): ('error', 'Error'), ], default='opened', index=True) - number = fields.Integer(required=True, index=True) + number = fields.Integer(required=True, index=True, group_operator=None) author = fields.Many2one('res.partner') head = fields.Char(required=True) label = fields.Char( @@ -530,7 +530,7 @@ class PullRequests(models.Model): reviewed_by = fields.Many2one('res.partner') delegates = fields.Many2many('res.partner', help="Delegate reviewers, not intrinsically reviewers but can review this PR") - priority = fields.Integer(default=2, index=True) + priority = fields.Integer(default=2, index=True, group_operator=None) overrides = fields.Char(required=True, default='{}') statuses = fields.Text( @@ -1505,7 +1505,7 @@ class Tagging(models.Model): repository = fields.Many2one('runbot_merge.repository', required=True) # store the PR number (not id) as we need a Tagging for PR objects # being deleted (retargeted to non-managed branches) - pull_request = fields.Integer() + pull_request = fields.Integer(group_operator=None) tags_remove = fields.Char(required=True, default='[]') tags_add = fields.Char(required=True, default='[]') @@ -1572,7 +1572,7 @@ class Feedback(models.Model): repository = fields.Many2one('runbot_merge.repository', required=True) # store the PR number (not id) as we may want to send feedback to PR # objects on non-handled branches - pull_request = fields.Integer() + pull_request = fields.Integer(group_operator=None) message = fields.Char() close = fields.Boolean() token_field = fields.Selection( @@ -2188,7 +2188,7 @@ class FetchJob(models.Model): active = fields.Boolean(default=True) repository = fields.Many2one('runbot_merge.repository', required=True) - number = fields.Integer(required=True) + number = fields.Integer(required=True, group_operator=None) def _check(self, commit=False): """