mirror of
https://github.com/odoo/runbot.git
synced 2025-03-15 23:45:44 +07:00
[IMP] runbot_merge: separate splits from other awaiting PRs
Should make the (eventual) wait and the extent of the splitting clearer. Fixes #217
This commit is contained in:
parent
60c8f0f498
commit
85035ad2c0
@ -48,15 +48,34 @@
|
||||
</a>
|
||||
</h2>
|
||||
<t t-call="runbot_merge.stagings"/>
|
||||
<t t-set="splits" t-value="branch.split_ids"/>
|
||||
<t t-set="ready_unstaged" t-value="
|
||||
project.env['runbot_merge.pull_requests'].search([
|
||||
('target', '=', branch.id),
|
||||
('state', '=', 'ready'),
|
||||
('staging_id', '=', False),
|
||||
])
|
||||
]) - splits.mapped('batch_ids.prs')
|
||||
"/>
|
||||
<t t-set="ready" t-value="ready_unstaged.filtered(lambda p: not p.blocked)"/>
|
||||
<t t-set="blocked" t-value="ready_unstaged.filtered(lambda p: p.blocked)"/>
|
||||
<div t-if="splits" class="splits bg-warning pr-awaiting">
|
||||
<h5>
|
||||
Splits
|
||||
<small class="text-muted">will be staged next</small>
|
||||
</h5>
|
||||
<ul>
|
||||
<li t-foreach="splits" t-as="split">
|
||||
<ul class="pr-listing list-inline list-unstyled mb0">
|
||||
<li t-foreach="split.mapped('batch_ids.prs')" t-as="pr">
|
||||
<a t-attf-href="https://github.com/{{ pr.repository.name }}/pull/{{ pr.number }}"
|
||||
t-att-title="pr.message.split('\n')[0]">
|
||||
<t t-esc="pr.repository.name"/>#<t t-esc="pr.number"/>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div t-if="ready" class="pr-listing pr-awaiting bg-warning">
|
||||
<h5>Awaiting</h5>
|
||||
<ul class="list-inline">
|
||||
|
Loading…
Reference in New Issue
Block a user