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

[FIX] runbot: fix compute previous_version and intermediates

Browse Source 
When changing the sticky value in a branch form, it triggers the
computes of previous version and intermediate versions.

In the onchange situation, the branch.id is a NEW id and it fails with a
traceback.

With this commit, a verification is made to ensure that the id is there.
This commit is contained in:
Christophe Monniez 2020-01-15 10:11:36 +01:00
parent 45799df094
commit 8cc82b7dde
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot/models/branch.py
View File

@ -69,7 +69,7 @@ class runbot_branch(models.Model):
if branch.closest_sticky == branch:
repo_ids = (branch.repo_id | branch.repo_id.duplicate_id).ids
domain = [('branch_name', 'like', '%.0'), ('sticky', '=', True), ('branch_name', '!=', 'master'), ('repo_id', 'in', repo_ids)]
if branch.branch_name != 'master':
if branch.branch_name != 'master' and branch.id:
domain += [('id', '<', branch.id)]
branch.previous_version = self.search(domain, limit=1, order='id desc')
else:
@ -84,7 +84,7 @@ class runbot_branch(models.Model):
continue
repo_ids = (branch.repo_id | branch.repo_id.duplicate_id).ids
domain = [('id', '>', branch.previous_version.id), ('sticky', '=', True), ('branch_name', '!=', 'master'), ('repo_id', 'in', repo_ids)]
if branch.closest_sticky.branch_name != 'master':
if branch.closest_sticky.branch_name != 'master' and branch.closest_sticky.id:
domain += [('id', '<', branch.closest_sticky.id)]
branch.intermediate_stickies = [(6, 0, self.search(domain, order='id desc').ids)]
else: