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

[IMP] runbot: only display default config in glances

Browse Source
This commit is contained in:
Xavier-Do 2019-06-27 10:46:42 +02:00
parent 47396ddb46
commit 84ad4cefe0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runbot/controllers/frontend.py
View File

@ -274,6 +274,7 @@ class Runbot(Controller):
@route('/runbot/glances', type='http', auth='public', website=True) @route('/runbot/glances', type='http', auth='public', website=True)
def glances(self, refresh=None): def glances(self, refresh=None):
repos = request.env['runbot.repo'].search([]) # respect record rules repos = request.env['runbot.repo'].search([]) # respect record rules
default_config_id = request.env.ref('runbot.runbot_build_config_default').id
query = """ query = """
SELECT split_part(r.name, ':', 2), SELECT split_part(r.name, ':', 2),
br.branch_name, br.branch_name,
@ -288,11 +289,14 @@ class Runbot(Controller):
bu.global_state in ('running', 'done') bu.global_state in ('running', 'done')
) )
AND bu.global_result not in ('skipped', 'manually_killed') AND bu.global_result not in ('skipped', 'manually_killed')
AND (bu.config_id = r.repo_config_id
OR bu.config_id = br.branch_config_id
OR bu.config_id = %s)
GROUP BY 1,2,r.sequence,br.id GROUP BY 1,2,r.sequence,br.id
ORDER BY r.sequence, (br.branch_name='master'), br.id ORDER BY r.sequence, (br.branch_name='master'), br.id
""" """
cr = request.env.cr cr = request.env.cr
cr.execute(query, [tuple(repos.ids)]) cr.execute(query, (tuple(repos.ids), default_config_id))
ctx = OrderedDict() ctx = OrderedDict()
for row in cr.fetchall(): for row in cr.fetchall():
ctx.setdefault(row[0], []).append(row[1:]) ctx.setdefault(row[0], []).append(row[1:])