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

[REF] runbot: replace t-esc with t-out

Browse Source 
t-esc has been deprecated and uses redirects to t-out anyways, removing
since in dev mode it logs a warning in the terminal.

See odoo/odoo#81024
This commit is contained in:
William Braeckman 2024-12-05 15:56:00 +01:00 committed by William Braeckman (wbr)
parent 01e7676cb6
commit 28ce031886
17 changed files with 242 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forwardport/data/views.xml
View File

@ -15,7 +15,7 @@
])"/> ])"/>
<div t-if="outstanding != 0" class="alert col-md-12 alert-warning mb-0"> <div t-if="outstanding != 0" class="alert col-md-12 alert-warning mb-0">
<a href="/forwardport/outstanding"> <a href="/forwardport/outstanding">
<t t-esc="outstanding"/> outstanding forward-ports (>1 week) <t t-out="outstanding"/> outstanding forward-ports (>1 week)
</a> </a>
</div> </div>
</t> </t>

4
runbot/static/src/js/fields/fields.js
View File

@ -23,7 +23,7 @@ function stringify(obj) {
export class JsonField extends TextField { export class JsonField extends TextField {
static template = xml` static template = xml`
<t t-if="props.readonly"> <t t-if="props.readonly">
<span t-esc="value"/> <span t-out="value"/>
</t> </t>
<t t-else=""> <t t-else="">
<div t-ref="div"> <div t-ref="div">
@ -64,7 +64,7 @@ registry.category("fields").add("runbotjsonb", {
export class FrontendUrl extends Component { export class FrontendUrl extends Component {
static template = xml` static template = xml`
<div><a t-att-href="route" target="_blank"><t t-esc="displayValue"/></a></div> <div><a t-att-href="route" target="_blank"><t t-out="displayValue"/></a></div>
`; `;
static components = { Many2OneField }; static components = { Many2OneField };

14
runbot/static/src/js/fields/tracking_value.xml
View File

@ -9,24 +9,24 @@
<button class="btn btn-sm btn-outline-primary" t-on-click="toggleKept">Toggle context</button> <button class="btn btn-sm btn-outline-primary" t-on-click="toggleKept">Toggle context</button>
<button class="btn btn-sm btn-outline-primary" t-on-click="copyNewToClipboard(trackingValue)">Copy new value to clipboard</button> <button class="btn btn-sm btn-outline-primary" t-on-click="copyNewToClipboard(trackingValue)">Copy new value to clipboard</button>
</div> </div>
<div class="o-mail-Message-trackingField ms-1 fst-italic text-muted">(<t t-esc="trackingValue.changedField"/>)</div> <div class="o-mail-Message-trackingField ms-1 fst-italic text-muted">(<t t-out="trackingValue.changedField"/>)</div>
<div class="code_diff"> <div class="code_diff">
<table> <table>
<t t-foreach="lines(trackingValue)" t-as="line" t-key="line_index"> <t t-foreach="lines(trackingValue)" t-as="line" t-key="line_index">
<tr t-if="kept or line.type!=='kept'"> <tr t-if="kept or line.type!=='kept'">
<td class="col_number" t-esc="line.pre_line_counter"/> <td class="col_number" t-out="line.pre_line_counter"/>
<td class="col_number" t-esc="line.post_line_counter"/> <td class="col_number" t-out="line.post_line_counter"/>
<td class="code" t-att-class="line.type" t-esc="line.line"/> <td class="code" t-att-class="line.type" t-out="line.line"/>
</tr> </tr>
</t> </t>
</table> </table>
</div> </div>
</t> </t>
<t t-else=""> <t t-else="">
<span class="o-mail-Message-trackingOld me-1 px-1 text-muted fw-bold" t-esc="formatTrackingOrNone(trackingValue.fieldType, trackingValue.oldValue)"/> <span class="o-mail-Message-trackingOld me-1 px-1 text-muted fw-bold" t-out="formatTrackingOrNone(trackingValue.fieldType, trackingValue.oldValue)"/>
<i class="o-mail-Message-trackingSeparator fa fa-long-arrow-right mx-1 text-600"/> <i class="o-mail-Message-trackingSeparator fa fa-long-arrow-right mx-1 text-600"/>
<span class="o-mail-Message-trackingNew me-1 fw-bold text-info" t-esc="formatTrackingOrNone(trackingValue.fieldType, trackingValue.newValue)"/> <span class="o-mail-Message-trackingNew me-1 fw-bold text-info" t-out="formatTrackingOrNone(trackingValue.fieldType, trackingValue.newValue)"/>
<span class="o-mail-Message-trackingField ms-1 fst-italic text-muted">(<t t-esc="trackingValue.changedField"/>)</span> <span class="o-mail-Message-trackingField ms-1 fst-italic text-muted">(<t t-out="trackingValue.changedField"/>)</span>
</t> </t>
</li> </li>
</xpath> </xpath>

16
runbot/templates/badge.xml
View File

@ -15,10 +15,10 @@
<rect t-att-x="left.width" width="4" height="18" t-att-fill="right.color"/> <rect t-att-x="left.width" width="4" height="18" t-att-fill="right.color"/>
<rect rx="4" t-attf-width="{{ left.width + right.width }}" height="18" fill="url(#smooth)"/> <rect rx="4" t-attf-width="{{ left.width + right.width }}" height="18" fill="url(#smooth)"/>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text t-attf-x="{{left.width/2+1}}" y="13" fill="#010101" fill-opacity=".3"><t t-esc="left.text"/></text> <text t-attf-x="{{left.width/2+1}}" y="13" fill="#010101" fill-opacity=".3"><t t-out="left.text"/></text>
<text t-attf-x="{{left.width/2+1}}" y="12"><t t-esc="left.text"/></text> <text t-attf-x="{{left.width/2+1}}" y="12"><t t-out="left.text"/></text>
<text t-attf-x="{{left.width+right.width/2-1}}" y="13" fill="#010101" fill-opacity=".3"><t t-esc="right.text"/></text> <text t-attf-x="{{left.width+right.width/2-1}}" y="13" fill="#010101" fill-opacity=".3"><t t-out="right.text"/></text>
<text t-attf-x="{{left.width+right.width/2-1}}" y="12"><t t-esc="right.text"/></text> <text t-attf-x="{{left.width+right.width/2-1}}" y="12"><t t-out="right.text"/></text>
</g> </g>
</svg> </svg>
</template> </template>
@ -36,10 +36,10 @@
<rect t-att-x="left.width" width="4" height="20" t-att-fill="right.color"/> <rect t-att-x="left.width" width="4" height="20" t-att-fill="right.color"/>
<rect rx="3" t-attf-width="{{ left.width + right.width }}" height="20" fill="url(#smooth)"/> <rect rx="3" t-attf-width="{{ left.width + right.width }}" height="20" fill="url(#smooth)"/>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text t-attf-x="{{left.width/2+1}}" y="15" fill="#010101" fill-opacity=".3"><t t-esc="left.text"/></text> <text t-attf-x="{{left.width/2+1}}" y="15" fill="#010101" fill-opacity=".3"><t t-out="left.text"/></text>
<text t-attf-x="{{left.width/2+1}}" y="14"><t t-esc="left.text"/></text> <text t-attf-x="{{left.width/2+1}}" y="14"><t t-out="left.text"/></text>
<text t-attf-x="{{left.width+right.width/2-1}}" y="15" fill="#010101" fill-opacity=".3"><t t-esc="right.text"/></text> <text t-attf-x="{{left.width+right.width/2-1}}" y="15" fill="#010101" fill-opacity=".3"><t t-out="right.text"/></text>
<text t-attf-x="{{left.width+right.width/2-1}}" y="14"><t t-esc="right.text"/></text> <text t-attf-x="{{left.width+right.width/2-1}}" y="14"><t t-out="right.text"/></text>
</g> </g>
</svg> </svg>
</template> </template>

50
runbot/templates/batch.xml
View File

@ -10,7 +10,7 @@
<tr> <tr>
<td>Bundle</td> <td>Bundle</td>
<td> <td>
<a t-esc="batch.bundle_id.name" t-attf-href="/runbot/bundle/{{batch.bundle_id.id}}"/> <a t-out="batch.bundle_id.name" t-attf-href="/runbot/bundle/{{batch.bundle_id.id}}"/>
&amp;emsp; &amp;emsp;
<a groups="runbot.group_runbot_advanced_user" t-attf-href="/web/#id={{batch.id}}&amp;view_type=form&amp;model=runbot.batch&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" class="btn btn-default btn-sm" target="new" title="View Batch in Backend"> <a groups="runbot.group_runbot_advanced_user" t-attf-href="/web/#id={{batch.id}}&amp;view_type=form&amp;model=runbot.batch&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" class="btn btn-default btn-sm" target="new" title="View Batch in Backend">
<i class="fa fa-list"/> <i class="fa fa-list"/>
@ -19,28 +19,28 @@
</tr> </tr>
<tr t-if="batch.category_id.id != default_category"> <tr t-if="batch.category_id.id != default_category">
<td>Category</td> <td>Category</td>
<td t-esc="batch.category_id.name"></td> <td t-out="batch.category_id.name"></td>
</tr> </tr>
<tr> <tr>
<td>Version</td> <td>Version</td>
<td t-esc="batch.slot_ids[0].params_id.version_id.name if batch.slot_ids else batch.bundle_id.version_id.name"/> <td t-out="batch.slot_ids[0].params_id.version_id.name if batch.slot_ids else batch.bundle_id.version_id.name"/>
</tr> </tr>
<tr> <tr>
<td>Create date</td> <td>Create date</td>
<td t-esc="batch.create_date"/> <td t-out="batch.create_date"/>
</tr> </tr>
<tr t-if="more"> <tr t-if="more">
<td>Last update</td> <td>Last update</td>
<td> <td>
<t t-esc="batch.last_update"/> <t t-out="batch.last_update"/>
<span class="badge text-bg-info" t-esc="s2human(batch.last_update - batch.create_date)"/> <span class="badge text-bg-info" t-out="s2human(batch.last_update - batch.create_date)"/>
</td> </td>
</tr> </tr>
<tr t-if="more and batch.reference_batch_ids"> <tr t-if="more and batch.reference_batch_ids">
<td>Version reference batches (for upgrade)</td> <td>Version reference batches (for upgrade)</td>
<td> <td>
<t t-foreach="batch.reference_batch_ids" t-as="reference_batch"/> <t t-foreach="batch.reference_batch_ids" t-as="reference_batch"/>
<div><a t-attf-href="/runbot/batch/{{reference_batch.id}}"><t t-esc="reference_batch.bundle_id.version_id.name"/> (<t t-esc="reference_batch.id"/>)</a></div> <div><a t-attf-href="/runbot/batch/{{reference_batch.id}}"><t t-out="reference_batch.bundle_id.version_id.name"/> (<t t-out="reference_batch.id"/>)</a></div>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -54,63 +54,63 @@
<i class="fa fa-fw fa-link" t-if="commit_link.match_type == 'head'" title="This commit is an existing head from bundle branches"/> <i class="fa fa-fw fa-link" t-if="commit_link.match_type == 'head'" title="This commit is an existing head from bundle branches"/>
<i class="fa fa-fw fa-code-fork" t-if="commit_link.match_type == 'base_match'" title="This commit is matched from a base batch with matching merge_base"/> <i class="fa fa-fw fa-code-fork" t-if="commit_link.match_type == 'base_match'" title="This commit is matched from a base batch with matching merge_base"/>
<i class="fa fa-fw fa-clock-o" t-if="commit_link.match_type == 'base_head'" title="This commit is the head of a base branch"/> <i class="fa fa-fw fa-clock-o" t-if="commit_link.match_type == 'base_head'" title="This commit is the head of a base branch"/>
<span class="label" t-esc="commit.dname"/> <span class="label" t-out="commit.dname"/>
</a> </a>
<a t-att-href="'https://%s/commit/%s' % (commit_link.branch_id.remote_id.base_url, commit_link.commit_id.name)" title="View Commit on Github"><i class="fa fa-github"/></a> <a t-att-href="'https://%s/commit/%s' % (commit_link.branch_id.remote_id.base_url, commit_link.commit_id.name)" title="View Commit on Github"><i class="fa fa-github"/></a>
<small t-if="commit_link.match_type and commit_link.match_type.startswith('base')"> <small t-if="commit_link.match_type and commit_link.match_type.startswith('base')">
from base: from base:
<span t-esc="commit_link.branch_id.name"/> <span t-out="commit_link.branch_id.name"/>
<br/> <br/>
</small> </small>
<small t-else=""> <small t-else="">
found in branch found in branch
<span t-esc="commit_link.branch_id.name"/> <span t-out="commit_link.branch_id.name"/>
<t t-if="batch.state != 'preparing'"> <t t-if="batch.state != 'preparing'">
<span t-esc="'+%s' % commit_link.diff_add" class="text-success"/> <span t-out="'+%s' % commit_link.diff_add" class="text-success"/>
<span t-esc="'-%s' % commit_link.diff_remove" class="text-danger"/> <span t-out="'-%s' % commit_link.diff_remove" class="text-danger"/>
<span class="text-info"> <span class="text-info">
( (
<span t-esc="commit_link.file_changed"/> <span t-out="commit_link.file_changed"/>
<i class="fa fa-file"/> <i class="fa fa-file"/>
) )
<span io="behind">( <span io="behind">(
<span t-esc="'%s ahead' % commit_link.base_ahead" class="text-success"/> <span t-out="'%s ahead' % commit_link.base_ahead" class="text-success"/>
, ,
<span t-esc="'%s behind' % commit_link.base_behind" class="text-danger"/> <span t-out="'%s behind' % commit_link.base_behind" class="text-danger"/>
)</span> )</span>
</span> </span>
</t> </t>
<br/> <br/>
<t t-if="more"> <t t-if="more">
Base head: Base head:
<span t-esc="commit_link.base_commit_id.name"/> <span t-out="commit_link.base_commit_id.name"/>
<br/> <br/>
Merge base: Merge base:
<span t-esc="commit_link.merge_base_commit_id.name"/> <span t-out="commit_link.merge_base_commit_id.name"/>
<br/> <br/>
</t> </t>
</small> </small>
<b t-if="commit.rebase_on_id">Automatic rebase on <t t-esc="commit.rebase_on_id.name"/><br/></b> <b t-if="commit.rebase_on_id">Automatic rebase on <t t-out="commit.rebase_on_id.name"/><br/></b>
<t t-if="more or not (commit_link.match_type and commit_link.match_type.startswith('base'))"> <t t-if="more or not (commit_link.match_type and commit_link.match_type.startswith('base'))">
Subject: Subject:
<span t-esc="commit.subject"/> <span t-out="commit.subject"/>
<br/> <br/>
Author: Author:
<span t-esc="commit.author"/> <span t-out="commit.author"/>
( (
<span t-esc="commit.author_email"/> <span t-out="commit.author_email"/>
) )
<br/> <br/>
<t t-if="commit.author != commit.committer"> <t t-if="commit.author != commit.committer">
Committer: Committer:
<span t-esc="commit.committer"/> <span t-out="commit.committer"/>
( (
<span t-esc="commit.committer_email"/> <span t-out="commit.committer_email"/>
) )
<br/> <br/>
</t> </t>
Commit date: Commit date:
<span t-esc="commit.date"/> <span t-out="commit.date"/>
<br/> <br/>
</t> </t>
<hr/> <hr/>
@ -155,7 +155,7 @@
<t t-foreach="batch.log_ids" t-as="log"> <t t-foreach="batch.log_ids" t-as="log">
<t t-set="logclass" t-value="dict(ERROR='danger', WARNING='warning', INFO='info').get(log.level, 'warning')"/> <t t-set="logclass" t-value="dict(ERROR='danger', WARNING='warning', INFO='info').get(log.level, 'warning')"/>
<div t-attf-class="alert alert-{{logclass}}"> <div t-attf-class="alert alert-{{logclass}}">
<b t-esc="log.level"/> <b t-out="log.level"/>
-- --
<t t-out="log._markdown()"/> <t t-out="log._markdown()"/>
</div> </div>

26
runbot/templates/branch.xml
View File

@ -8,7 +8,7 @@
<div class='col-md-12'> <div class='col-md-12'>
<div class="navbar navbar-default"> <div class="navbar navbar-default">
<h3> <h3>
<span class="text-muted"><t t-esc="branch.remote_id.short_name"/>:</span><t t-esc="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/> <span class="text-muted"><t t-out="branch.remote_id.short_name"/>:</span><t t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a t-att-href="branch.branch_url" class="btn btn-sm text-start" title="View Branch on Github"><i class="fa fa-github"/></a> <a t-att-href="branch.branch_url" class="btn btn-sm text-start" title="View Branch on Github"><i class="fa fa-github"/></a>
<a groups="runbot.group_runbot_admin" class="btn btn-sm fa fa-list text-start" t-attf-href="/web/#id={{branch.id}}&amp;view_type=form&amp;model=runbot.branch" target="new" title="View Branch in Backend"/> <a groups="runbot.group_runbot_admin" class="btn btn-sm fa fa-list text-start" t-attf-href="/web/#id={{branch.id}}&amp;view_type=form&amp;model=runbot.branch" target="new" title="View Branch in Backend"/>
@ -18,11 +18,11 @@
<table class="table table-condensed table-responsive table-stripped"> <table class="table table-condensed table-responsive table-stripped">
<tr> <tr>
<td>Remote:</td> <td>Remote:</td>
<td t-esc="branch.remote_id.name"></td> <td t-out="branch.remote_id.name"></td>
</tr> </tr>
<tr> <tr>
<td>Head:</td> <td>Head:</td>
<td t-esc="branch.head_name"></td> <td t-out="branch.head_name"></td>
</tr> </tr>
<tr> <tr>
<td>Bundle:</td> <td>Bundle:</td>
@ -30,7 +30,7 @@
<small> <small>
<div class="btn-toolbar mb-1" role="toolbar"> <div class="btn-toolbar mb-1" role="toolbar">
<div class="btn-group btn-group-ssm w-100" role="group"> <div class="btn-group btn-group-ssm w-100" role="group">
<a t-attf-href="/runbot/bundle/{{branch.bundle_id.id}}" t-esc="branch.bundle_id.name" class="btn btn-default text-start" title="View Bundle Details"/> <a t-attf-href="/runbot/bundle/{{branch.bundle_id.id}}" t-out="branch.bundle_id.name" class="btn btn-default text-start" title="View Bundle Details"/>
</div> </div>
</div> </div>
</small> </small>
@ -39,21 +39,21 @@
<t t-if="branch.is_pr"> <t t-if="branch.is_pr">
<tr t-if="pr_branch"> <tr t-if="pr_branch">
<td>Pull Head Name</td> <td>Pull Head Name</td>
<td><a t-attf-href="/runbot/branch/{{pr_branch.id}}" t-esc="branch.pull_head_name" title="View PR Details"/></td> <td><a t-attf-href="/runbot/branch/{{pr_branch.id}}" t-out="branch.pull_head_name" title="View PR Details"/></td>
</tr> </tr>
<tr> <tr>
<td>Target Branch</td> <td>Target Branch</td>
<td t-esc="branch.target_branch_name"></td> <td t-out="branch.target_branch_name"></td>
</tr> </tr>
<tr> <tr>
<td>Pr title</td> <td>Pr title</td>
<td t-esc="branch.pr_title"/> <td t-out="branch.pr_title"/>
</tr> </tr>
</t> </t>
<t t-elif="branch_pr"> <t t-elif="branch_pr">
<tr> <tr>
<td>Pull Request:</td> <td>Pull Request:</td>
<td><a t-attf-href="/runbot/branch/{{branch_pr.id}}" t-esc="branch_pr.name" title="View Branch Details"/></td> <td><a t-attf-href="/runbot/branch/{{branch_pr.id}}" t-out="branch_pr.name" title="View Branch Details"/></td>
</tr> </tr>
</t> </t>
</table> </table>
@ -68,11 +68,11 @@
</tr> </tr>
</thead> </thead>
<tr t-foreach='branch.reflog_ids' t-as='reflog'> <tr t-foreach='branch.reflog_ids' t-as='reflog'>
<td t-esc="reflog.date"/> <td t-out="reflog.date"/>
<td><a t-attf-href="/runbot/commit/{{reflog.commit_id.id}}" t-esc="reflog.commit_id.name"/></td> <td><a t-attf-href="/runbot/commit/{{reflog.commit_id.id}}" t-out="reflog.commit_id.name"/></td>
<td t-esc="reflog.commit_id.date"/> <td t-out="reflog.commit_id.date"/>
<td t-esc="reflog.commit_id.author"/> <td t-out="reflog.commit_id.author"/>
<td t-esc="reflog.commit_id.subject"/> <td t-out="reflog.commit_id.subject"/>
</tr> </tr>
</table> </table>
<h4 t-else="">No Reflogs Found</h4> <h4 t-else="">No Reflogs Found</h4>

106
runbot/templates/build.xml
View File

@ -29,22 +29,22 @@
<ol class="breadcrumb mb-0"> <ol class="breadcrumb mb-0">
<li t-attf-class="breadcrumb-item"> <li t-attf-class="breadcrumb-item">
<a t-attf-href="/runbot/{{build.params_id.project_id.id}}"> <a t-attf-href="/runbot/{{build.params_id.project_id.id}}">
<t t-esc="build.params_id.project_id.name"/> <t t-out="build.params_id.project_id.name"/>
</a> </a>
</li> </li>
<li t-if="unique_bundle" t-attf-class="breadcrumb-item"> <li t-if="unique_bundle" t-attf-class="breadcrumb-item">
<a t-att-href="unique_bundle._url()"> <a t-att-href="unique_bundle._url()">
<t t-esc="unique_bundle.name"/> <t t-out="unique_bundle.name"/>
</a> </a>
</li> </li>
<li t-if="unique_batch" t-attf-class="breadcrumb-item"> <li t-if="unique_batch" t-attf-class="breadcrumb-item">
<a t-att-href="unique_batch._url()"> <a t-att-href="unique_batch._url()">
batch-<t t-esc="unique_batch.id"/> (<t t-esc="build.params_id.trigger_id.name"/>) batch-<t t-out="unique_batch.id"/> (<t t-out="build.params_id.trigger_id.name"/>)
</a> </a>
</li> </li>
<li t-foreach="build.ancestors" t-as="ancestor" t-attf-class="breadcrumb-item{{' active' if ancestor == build else ''}}"> <li t-foreach="build.ancestors" t-as="ancestor" t-attf-class="breadcrumb-item{{' active' if ancestor == build else ''}}">
<a t-att-href="ancestor.build_url"> <a t-att-href="ancestor.build_url">
<t t-esc="ancestor.description or ancestor.config_id.name"/> <t t-out="ancestor.description or ancestor.config_id.name"/>
</a> </a>
</li> </li>
</ol> </ol>
@ -70,14 +70,14 @@
<div class="build_details"> <div class="build_details">
<!-- Batch/bundles links--> <!-- Batch/bundles links-->
<t t-if="len(bundles) > 1"> <t t-if="len(bundles) > 1">
This build is referenced in <t t-esc="len(bundles)"/> bundles This build is referenced in <t t-out="len(bundles)"/> bundles
<ul> <ul>
<li t-foreach="bundles" t-as="bundle" ><a t-esc="bundle.name" t-attf-href="/runbot/bundle/{{bundle.id}}"/></li> <li t-foreach="bundles" t-as="bundle" ><a t-out="bundle.name" t-attf-href="/runbot/bundle/{{bundle.id}}"/></li>
</ul> </ul>
</t> </t>
<t t-if="len(batches) > 1"> <t t-if="len(batches) > 1">
<b>First apparition:</b> <a t-esc="batches[0].bundle_id.name" t-attf-href="/runbot/batch/{{batches[0].id}}"/><br/> <b>First apparition:</b> <a t-out="batches[0].bundle_id.name" t-attf-href="/runbot/batch/{{batches[0].id}}"/><br/>
<b>Last apparition:</b> <a t-esc="batches[-1].bundle_id.name" t-attf-href="/runbot/batch/{{batches[-1].id}}"/><br/> <b>Last apparition:</b> <a t-out="batches[-1].bundle_id.name" t-attf-href="/runbot/batch/{{batches[-1].id}}"/><br/>
</t> </t>
<!-- Parent --> <!-- Parent -->
<div t-if="build.parent_id and build.orphan_result"> <div t-if="build.parent_id and build.orphan_result">
@ -95,7 +95,7 @@
<t t-foreach="build.params_id.sudo().commit_link_ids" t-as="build_commit"> <t t-foreach="build.params_id.sudo().commit_link_ids" t-as="build_commit">
<b>Commit:</b> <b>Commit:</b>
<a t-attf-href="/runbot/commit/{{build_commit.commit_id.id}}"> <a t-attf-href="/runbot/commit/{{build_commit.commit_id.id}}">
<t t-esc="build_commit.commit_id.dname"/> <t t-out="build_commit.commit_id.dname"/>
</a> </a>
&amp;nbsp; &amp;nbsp;
<a t-att-href="'https://%s/commit/%s' % (build_commit.branch_id.remote_id.base_url, build_commit.commit_id.name)" title="View Commit on Github"><i class="fa fa-github"/></a> <a t-att-href="'https://%s/commit/%s' % (build_commit.branch_id.remote_id.base_url, build_commit.commit_id.name)" title="View Commit on Github"><i class="fa fa-github"/></a>
@ -105,40 +105,40 @@
</t> </t>
<div t-else="" class="ms-3"> <div t-else="" class="ms-3">
<b>Subject:</b> <b>Subject:</b>
<t t-esc="build_commit.commit_id.subject"/> <t t-out="build_commit.commit_id.subject"/>
<br/> <br/>
<b>Author:</b> <b>Author:</b>
<t t-esc="build_commit.commit_id.author"/> <t t-out="build_commit.commit_id.author"/>
<br/> <br/>
<b>Committer:</b> <b>Committer:</b>
<t t-esc="build_commit.commit_id.committer"/> <t t-out="build_commit.commit_id.committer"/>
<br/> <br/>
</div> </div>
</t> </t>
<b>Version:</b> <b>Version:</b>
<t t-esc="build.params_id.version_id.name"/> <t t-out="build.params_id.version_id.name"/>
<br/> <br/>
<b>Config:</b> <b>Config:</b>
<t t-esc="build.params_id.config_id.name"/> <t t-out="build.params_id.config_id.name"/>
<br/> <br/>
<t t-if='more'> <t t-if='more'>
<b>Trigger:</b> <b>Trigger:</b>
<t t-esc="build.params_id.trigger_id.name"/> <t t-out="build.params_id.trigger_id.name"/>
<br/> <br/>
<b>Config data:</b> <b>Config data:</b>
<t t-esc="build.params_id.config_data.dict"/> <t t-out="build.params_id.config_data.dict"/>
<br/> <br/>
<b>Modules:</b> <b>Modules:</b>
<t t-esc="build.params_id.modules"/> <t t-out="build.params_id.modules"/>
<br/> <br/>
<b>Extra params:</b> <b>Extra params:</b>
<t t-esc="build.params_id.extra_params"/> <t t-out="build.params_id.extra_params"/>
<br/> <br/>
<t t-if="len(build.params_id.builds_reference_ids) > 1"> <t t-if="len(build.params_id.builds_reference_ids) > 1">
<b>Reference builds:</b> <b>Reference builds:</b>
<t t-foreach="build.params_id.builds_reference_ids" t-as="reference"> <t t-foreach="build.params_id.builds_reference_ids" t-as="reference">
<span t-esc="reference.id"/> <span t-out="reference.id"/>
</t> </t>
<br/> <br/>
</t> </t>
@ -149,39 +149,39 @@
<a t-if="simbuild.id != build.id" t-attf-href="/runbot/build/#{simbuild.id}"> <a t-if="simbuild.id != build.id" t-attf-href="/runbot/build/#{simbuild.id}">
<span <span
t-attf-class="badge text-bg-{{simbuild._get_color_class()}}" t-attf-class="badge text-bg-{{simbuild._get_color_class()}}"
t-esc="simbuild.id"/> t-out="simbuild.id"/>
</a> </a>
</t> </t>
<br/> <br/>
</t> </t>
<b>Host:</b> <b>Host:</b>
<t t-esc="build.host"/> <t t-out="build.host"/>
</t> </t>
<div> <div>
<b title="Execution time of this build, without child time"> <b title="Execution time of this build, without child time">
Build time: Build time:
</b> </b>
<t t-att-tile='build.build_time' t-esc="s2human(build.build_time)"/> <t t-att-tile='build.build_time' t-out="s2human(build.build_time)"/>
<i t-if='more'>(<t t-esc="build.build_time"/>s)</i> <i t-if='more'>(<t t-out="build.build_time"/>s)</i>
</div> </div>
<div> <div>
<b title='Time from creation to finish (queue time + completion time)'> <b title='Time from creation to finish (queue time + completion time)'>
Wait time: Wait time:
</b> </b>
<t t-att-tile='build.wait_time' t-esc="s2human(build.wait_time)"/> <t t-att-tile='build.wait_time' t-out="s2human(build.wait_time)"/>
<i t-if='more'>(<t t-esc="build.wait_time"/>s)</i> <i t-if='more'>(<t t-out="build.wait_time"/>s)</i>
</div> </div>
<div> <div>
<b title='Total time '> <b title='Total time '>
Load time: Load time:
</b> </b>
<t t-att-tile='build.load_time' t-esc="s2human(build.load_time)"/> <t t-att-tile='build.load_time' t-out="s2human(build.load_time)"/>
<i t-if='more'>(<t t-esc="build.load_time"/>s)</i> <i t-if='more'>(<t t-out="build.load_time"/>s)</i>
</div> </div>
<div> <div>
<t t-if="build.stat_ids"> <t t-if="build.stat_ids">
<b>Stats:</b> <b>Stats:</b>
<a t-attf-href="/runbot/build/stats/{{build.id}}">Build <t t-esc="build.id"/></a> <a t-attf-href="/runbot/build/stats/{{build.id}}">Build <t t-out="build.id"/></a>
<br/> <br/>
</t> </t>
</div> </div>
@ -200,14 +200,14 @@
<td> <td>
<a t-attf-href="/runbot/{{'batch/%s/' % from_batch.id if from_batch else ''}}build/{{child.id}}"> <a t-attf-href="/runbot/{{'batch/%s/' % from_batch.id if from_batch else ''}}build/{{child.id}}">
Build Build
<t t-esc="child.id"/> <t t-out="child.id"/>
</a> </a>
<t t-if="child.description"> <t t-if="child.description">
<t t-out="child.md_description" /> <t t-out="child.md_description" />
</t> </t>
<t t-else=""> <t t-else="">
with config with config
<t t-esc="child.params_id.config_id.name"/> <t t-out="child.params_id.config_id.name"/>
</t> </t>
<a groups="runbot.group_build_config_user" t-attf-href="/web#id={{child.params_id.config_id.id}}&amp;view_type=form&amp;model=runbot.build.config">...</a> <a groups="runbot.group_build_config_user" t-attf-href="/web#id={{child.params_id.config_id.id}}&amp;view_type=form&amp;model=runbot.build.config">...</a>
<t t-if="child.orphan_result"> <t t-if="child.orphan_result">
@ -215,15 +215,15 @@
</t> </t>
<t t-if="child.job"> <t t-if="child.job">
Running step: Running step:
<t t-esc="child.job"/> <t t-out="child.job"/>
</t> </t>
<t t-if="child.global_state in ['testing', 'waiting']"> <t t-if="child.global_state in ['testing', 'waiting']">
<i class="fa fa-spinner fa-spin"/> <i class="fa fa-spinner fa-spin"/>
<t t-esc="child.global_state"/> <t t-out="child.global_state"/>
</t> </t>
</td> </td>
<td> <td>
<span t-attf-class="badge text-bg-info" t-esc="s2human(child.build_time)"/> <span t-attf-class="badge text-bg-info" t-out="s2human(child.build_time)"/>
</td> </td>
<td> <td>
<t t-call="runbot.build_button"> <t t-call="runbot.build_button">
@ -252,13 +252,13 @@
<t t-set="logclass" t-value="dict(CRITICAL='danger', ERROR='danger', WARNING='warning', OK='success', SEPARATOR='separator').get(l.level)"/> <t t-set="logclass" t-value="dict(CRITICAL='danger', ERROR='danger', WARNING='warning', OK='success', SEPARATOR='separator').get(l.level)"/>
<tr t-att-class="'separator' if logclass == 'separator' else ''" t-att-title="l.active_step_id.description or ''"> <tr t-att-class="'separator' if logclass == 'separator' else ''" t-att-title="l.active_step_id.description or ''">
<td style="white-space: nowrap; width:1%;"> <td style="white-space: nowrap; width:1%;">
<t t-esc="l.create_date.strftime('%Y-%m-%d %H:%M:%S')"/> <t t-out="l.create_date.strftime('%Y-%m-%d %H:%M:%S')"/>
</td> </td>
<td style="white-space: nowrap; width:1%;"> <td style="white-space: nowrap; width:1%;">
<b t-if="l.level != 'SEPARATOR' and l.type not in ['link', 'markdown']" t-esc="l.level"/> <b t-if="l.level != 'SEPARATOR' and l.type not in ['link', 'markdown']" t-out="l.level"/>
</td> </td>
<td style="white-space: nowrap; width:1%;"> <td style="white-space: nowrap; width:1%;">
<t t-if="l.level != 'SEPARATOR' and l.type not in ['link', 'markdown']" t-esc="l.type"/> <t t-if="l.level != 'SEPARATOR' and l.type not in ['link', 'markdown']" t-out="l.type"/>
</td> </td>
<t t-set="message_class" t-value="''"/> <t t-set="message_class" t-value="''"/>
<t t-if="subbuild" t-set="message_class"> <t t-if="subbuild" t-set="message_class">
@ -271,7 +271,7 @@
<t t-if="l.type == 'subbuild'"> <t t-if="l.type == 'subbuild'">
<a t-attf-href="/runbot/build/{{l.path}}"> <a t-attf-href="/runbot/build/{{l.path}}">
Build # Build #
<t t-esc="l.path"/> <t t-out="l.path"/>
</a> </a>
</t> </t>
<t t-else=""> <t t-else="">
@ -283,31 +283,31 @@
<t t-set="path" t-value="l.path.replace('/data/build/%s/' % repo_name, '')"/> <t t-set="path" t-value="l.path.replace('/data/build/%s/' % repo_name, '')"/>
<t t-set="href" t-value="'https://%s/blob/%s/%s#L%s' % (repo_base_url, commit_hash, path, l.line)"/> <t t-set="href" t-value="'https://%s/blob/%s/%s#L%s' % (repo_base_url, commit_hash, path, l.line)"/>
</t> </t>
<a t-att-href="href" t-attf-title="Func: {{l.func}}"><t t-esc="l.name"/>:<t t-esc="l.line"/></a> <a t-att-href="href" t-attf-title="Func: {{l.func}}"><t t-out="l.name"/>:<t t-out="l.line"/></a>
</t> </t>
</t> </t>
<!-- DEPRECATED: Will be removed once no ir.logging is concerned. --> <!-- DEPRECATED: Will be removed once no ir.logging is concerned. -->
<span class="log_message" t-if="l.type == 'link' and len(l.message.split('$$')) == 3"> <span class="log_message" t-if="l.type == 'link' and len(l.message.split('$$')) == 3">
<t t-set="message" t-value="l.message.split('$$')"/> <t t-set="message" t-value="l.message.split('$$')"/>
<t t-if="message[1].startswith('fa-')"> <t t-if="message[1].startswith('fa-')">
<t t-esc="message[0]"/> <t t-out="message[0]"/>
<a t-attf-href="{{l.path}}"> <a t-attf-href="{{l.path}}">
<i t-attf-class="fa {{message[1]}}"/> <i t-attf-class="fa {{message[1]}}"/>
</a> </a>
<t t-esc="message[2]"/> <t t-out="message[2]"/>
</t> </t>
<t t-else=""> <t t-else="">
<t t-esc="message[0]"/> <t t-out="message[0]"/>
<a t-attf-href="{{l.path}}"> <a t-attf-href="{{l.path}}">
<t t-esc="message[1]"/> <t t-out="message[1]"/>
</a> </a>
<t t-esc="message[2]"/> <t t-out="message[2]"/>
</t> </t>
</span> </span>
<span class="log_message" t-elif="l.type == 'markdown'" t-out="l._markdown()"/> <span class="log_message" t-elif="l.type == 'markdown'" t-out="l._markdown()"/>
<span class="log_message" t-else=""> <span class="log_message" t-else="">
<t t-if="'\n' not in l.message" t-esc="l.message"/> <t t-if="'\n' not in l.message" t-out="l.message"/>
<pre t-if="'\n' in l.message" style="margin:0;padding:0; border: none;"><t t-esc="l.message"/></pre> <pre t-if="'\n' in l.message" style="margin:0;padding:0; border: none;"><t t-out="l.message"/></pre>
</span> </span>
</td> </td>
<td t-attf-class="bg-{{message_class.strip() or logclass}}-subtle"> <td t-attf-class="bg-{{message_class.strip() or logclass}}-subtle">
@ -326,14 +326,14 @@
<tr> <tr>
<td/><td/><td/> <td/><td/><td/>
<td t-attf-class="bg-{{'info' if error.active else 'success'}}-subtle" colspan="2"> <td t-attf-class="bg-{{'info' if error.active else 'success'}}-subtle" colspan="2">
This error is already <em t-attf-title="{{'Was detected by runbot in nightly builds.' if error.active else 'Either the error is not properly fixed or the branch does not contain the fix.'}}"><t t-esc="'known' if error.active else 'fixed'"/></em>. This error is already <em t-attf-title="{{'Was detected by runbot in nightly builds.' if error.active else 'Either the error is not properly fixed or the branch does not contain the fix.'}}"><t t-out="'known' if error.active else 'fixed'"/></em>.
<!--a groups="runbot.group_user" t-attf-href="/web#id={{error_content.id}}&amp;view_type=form&amp;model=runbot.build.error.content&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" title="View in Backend" target="new"> <!--a groups="runbot.group_user" t-attf-href="/web#id={{error_content.id}}&amp;view_type=form&amp;model=runbot.build.error.content&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" title="View in Backend" target="new">
<i t-attf-class="fa fa-search"/> <i t-attf-class="fa fa-search"/>
</a--> </a-->
<a groups="runbot.group_user" t-attf-href="/web#id={{error.id}}&amp;view_type=form&amp;model=runbot.build.error&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" title="View in Backend" target="new"> <a groups="runbot.group_user" t-attf-href="/web#id={{error.id}}&amp;view_type=form&amp;model=runbot.build.error&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" title="View in Backend" target="new">
<i t-attf-class="fa fa-list"/> <i t-attf-class="fa fa-list"/>
</a> </a>
<span groups="runbot.group_runbot_admin" t-if="error.responsible or error.responsible.id == uid">(<i t-esc="error.responsible.name"/>)</span> <span groups="runbot.group_runbot_admin" t-if="error.responsible or error.responsible.id == uid">(<i t-out="error.responsible.name"/>)</span>
</td> </td>
</tr> </tr>
</t> </t>
@ -356,11 +356,11 @@
</t> </t>
<tr t-attf-class="bg-{{rowclass.strip()}}-subtle{{' line-through' if build.orphan_result else ''}}"> <tr t-attf-class="bg-{{rowclass.strip()}}-subtle{{' line-through' if build.orphan_result else ''}}">
<td> <td>
<t t-esc="build.create_date"/> <t t-out="build.create_date"/>
</td> </td>
<td> <td>
<a t-attf-href="/runbot/{{'batch/%s/' % from_batch.id if from_batch else ''}}build/{{build.id}}"> <a t-attf-href="/runbot/{{'batch/%s/' % from_batch.id if from_batch else ''}}build/{{build.id}}">
<t t-esc="build.id"/> <t t-out="build.id"/>
</a> </a>
</td> </td>
<td> <td>
@ -371,17 +371,17 @@
<td> <td>
<t t-if="build.global_state in ['testing', 'waiting']"> <t t-if="build.global_state in ['testing', 'waiting']">
<i class="fa fa-spinner fa-spin"/> <i class="fa fa-spinner fa-spin"/>
<t t-esc="build.global_state"/> <t t-out="build.global_state"/>
</t> </t>
</td> </td>
<td> <td>
<span t-esc="build.params_id.config_id.name"/> <span t-out="build.params_id.config_id.name"/>
</td> </td>
<td> <td>
<span t-esc="build.params_id.version_id.name"/> <span t-out="build.params_id.version_id.name"/>
</td> </td>
<td> <td>
<span t-esc="s2human(build.build_time)"/> <span t-out="s2human(build.build_time)"/>
</td> </td>
<td> <td>
<t t-call="runbot.build_button"> <t t-call="runbot.build_button">

22
runbot/templates/build_error.xml
View File

@ -18,27 +18,27 @@
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<div class="row"> <div class="row">
<div class="col"><t t-esc="build_error.last_seen_date" t-options='{"widget": "datetime"}'/></div> <div class="col"><t t-out="build_error.last_seen_date" t-options='{"widget": "datetime"}'/></div>
<div class="col col-md-8"> <div class="col col-md-8">
<button class="btn accordion-button collapsed" type="button" data-bs-toggle="collapse" t-attf-data-bs-target="#collapse{{build_error.id}}" aria-expanded="true" aria-controls="collapseOne"> <button class="btn accordion-button collapsed" type="button" data-bs-toggle="collapse" t-attf-data-bs-target="#collapse{{build_error.id}}" aria-expanded="true" aria-controls="collapseOne">
<code><t t-esc="build_error.name"/></code> <code><t t-out="build_error.name"/></code>
</button> </button>
</div> </div>
<div class="col"> <div class="col">
<t t-foreach="build_error.trigger_ids" t-as="trigger"> <t t-foreach="build_error.trigger_ids" t-as="trigger">
<span class="badge text-bg-pill text-bg-info small"><t t-esc="trigger.name"/></span> <span class="badge text-bg-pill text-bg-info small"><t t-out="trigger.name"/></span>
</t> </t>
</div> </div>
<div class="col"> <div class="col">
<t t-if="build_error.responsible" t-esc="build_error.responsible.name"/> <t t-if="build_error.responsible" t-out="build_error.responsible.name"/>
<a t-else="" t-attf-href="/runbot/errors/assign/{{build_error.id}}" data-runbot="action" role="button" class="btn btn-primary btn-sm">Assign to me</a> <a t-else="" t-attf-href="/runbot/errors/assign/{{build_error.id}}" data-runbot="action" role="button" class="btn btn-primary btn-sm">Assign to me</a>
</div> </div>
<div class="col"> <div class="col">
<a t-att-href="build_error.last_seen_build_id.build_url" t-attf-title="View last affected build ({{build_error.last_seen_build_id.id}})"><i class="fa fa-external-link"/></a> <a t-att-href="build_error.last_seen_build_id.build_url" t-attf-title="View last affected build ({{build_error.last_seen_build_id.id}})"><i class="fa fa-external-link"/></a>
<a groups="base.group_user" t-attf-href="/web/#id={{build_error.id}}&amp;view_type=form&amp;model=runbot.build.error&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" target="new" title="View in Backend"> <a groups="base.group_user" t-attf-href="/web/#id={{build_error.id}}&amp;view_type=form&amp;model=runbot.build.error&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" target="new" title="View in Backend">
<span class="badge text-bg-info" t-esc="build_error.build_count" t-attf-title="This error was seen {{build_error.build_count}} View in backend"/> <span class="badge text-bg-info" t-out="build_error.build_count" t-attf-title="This error was seen {{build_error.build_count}} View in backend"/>
</a> </a>
<span groups="!base.group_user" class="badge text-bg-info" t-esc="build_error.build_count" t-attf-title="This error was seen {{build_error.build_count}}"/> <span groups="!base.group_user" class="badge text-bg-info" t-out="build_error.build_count" t-attf-title="This error was seen {{build_error.build_count}}"/>
<span class="fa fa-random" t-if="build_error.random"/> <span class="fa fa-random" t-if="build_error.random"/>
</div> </div>
</div> </div>
@ -46,7 +46,7 @@
<div t-attf-id="collapse{{build_error.id}}" class="collapse" aria-labelledby="headingOne" t-attf-data-parent="#accordion_{{accordion_id}}"> <div t-attf-id="collapse{{build_error.id}}" class="collapse" aria-labelledby="headingOne" t-attf-data-parent="#accordion_{{accordion_id}}">
<div class="card-body"> <div class="card-body">
<pre class="pre-scrollable bg-danger-subtle"><t t-esc="build_error.content.strip()" /></pre> <pre class="pre-scrollable bg-danger-subtle"><t t-out="build_error.content.strip()" /></pre>
</div> </div>
</div> </div>
</div> </div>
@ -79,11 +79,11 @@
<span class="ms-auto"> <span class="ms-auto">
<span class="dropdown me-auto"> <span class="dropdown me-auto">
<a role="button" href="#" class="dropdown-toggle btn btn-secondary" data-bs-toggle="dropdown"> <a role="button" href="#" class="dropdown-toggle btn btn-secondary" data-bs-toggle="dropdown">
Sort By: <t t-esc="request.params.get('sort', '')"/> Sort By: <t t-out="request.params.get('sort', '')"/>
</a> </a>
<div class="dropdown-menu" aria-labelledby="sortMenuButton" role="menu"> <div class="dropdown-menu" aria-labelledby="sortMenuButton" role="menu">
<t t-foreach="sort_order_choices" t-as="sort_choice"> <t t-foreach="sort_order_choices" t-as="sort_choice">
<a role="menuitem" class="dropdown-item" t-attf-href="/runbot/errors?sort={{sort_choice}}"><t t-esc="sort_order_choices[sort_choice]"/></a> <a role="menuitem" class="dropdown-item" t-attf-href="/runbot/errors?sort={{sort_choice}}"><t t-out="sort_order_choices[sort_choice]"/></a>
</t> </t>
</div> </div>
</span> </span>
@ -110,7 +110,7 @@
<div class="row"> <div class="row">
<div t-if="team" class='col-md-12'> <div t-if="team" class='col-md-12'>
<div class="col-lg-12 text-center mb16"> <div class="col-lg-12 text-center mb16">
<h2>Team <t t-esc="team.name.capitalize()"/> <h2>Team <t t-out="team.name.capitalize()"/>
<a groups="base.group_user" t-attf-href="/web/#id={{team.id}}&amp;view_type=form&amp;model=runbot.team&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" target="new" title="View in Backend"> <a groups="base.group_user" t-attf-href="/web/#id={{team.id}}&amp;view_type=form&amp;model=runbot.team&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" target="new" title="View in Backend">
<i class="fa fa-list"/> <i class="fa fa-list"/>
</a> </a>
@ -140,7 +140,7 @@
<div class="row"> <div class="row">
<div class="list-group list-group-horizontal"> <div class="list-group list-group-horizontal">
<t t-foreach="teams" t-as="team"> <t t-foreach="teams" t-as="team">
<a t-attf-href="/runbot/teams/{{ team.id }}" class="list-group-item list-group-item-action"><t t-esc="team.name"/></a> <a t-attf-href="/runbot/teams/{{ team.id }}" class="list-group-item list-group-item-action"><t t-out="team.name"/></a>
</t> </t>
</div> </div>
</div> </div>

30
runbot/templates/build_stats.xml
View File

@ -8,22 +8,22 @@
<div class="row g-0"> <div class="row g-0">
<div class="col-md-4"> <div class="col-md-4">
<div class="bg-success-subtle"> <div class="bg-success-subtle">
<b>Build: </b><a t-attf-href="/runbot/build/{{build.id}}"><t t-esc="build.id"/></a><br/> <b>Build: </b><a t-attf-href="/runbot/build/{{build.id}}"><t t-out="build.id"/></a><br/>
<t t-if="build.description"> <t t-if="build.description">
<b>Description:</b> <b>Description:</b>
<t t-out="build.md_description"/> <t t-out="build.md_description"/>
<br/> <br/>
</t> </t>
<b>Date: </b><t t-esc="build.create_date" /><br/> <b>Date: </b><t t-out="build.create_date" /><br/>
<b>Config: </b><t t-esc="build.params_id.config_id.name" /><br/> <b>Config: </b><t t-out="build.params_id.config_id.name" /><br/>
<b>Bundle(s): </b> <b>Bundle(s): </b>
<t t-foreach="bundles" t-as="bundle"> <t t-foreach="bundles" t-as="bundle">
<a t-attf-href="/runbot/bundle/{{bundle.id}}"><t t-esc="bundle.name" /></a> <a t-attf-href="/runbot/bundle/{{bundle.id}}"><t t-out="bundle.name" /></a>
</t><br/> </t><br/>
<t t-foreach="build.params_id.sudo().commit_link_ids" t-as="build_commit"> <t t-foreach="build.params_id.sudo().commit_link_ids" t-as="build_commit">
<b>Commit:</b> <b>Commit:</b>
<a t-attf-href="/runbot/commit/{{build_commit.commit_id.id}}"> <a t-attf-href="/runbot/commit/{{build_commit.commit_id.id}}">
<t t-esc="build_commit.commit_id.dname"/> <t t-out="build_commit.commit_id.dname"/>
</a> </a>
<a t-att-href="'https://%s/commit/%s' % (build_commit.branch_id.remote_id.base_url, build_commit.commit_id.name)" class="btn btn-sm text-start" title="View Commit on Github"><i class="fa fa-github"/></a> <a t-att-href="'https://%s/commit/%s' % (build_commit.branch_id.remote_id.base_url, build_commit.commit_id.name)" class="btn btn-sm text-start" title="View Commit on Github"><i class="fa fa-github"/></a>
<t t-if="build_commit.match_type in ('default', 'pr_target', 'prefix') "> <t t-if="build_commit.match_type in ('default', 'pr_target', 'prefix') ">
@ -32,27 +32,27 @@
</t> </t>
<div t-else="" class="ms-3"> <div t-else="" class="ms-3">
<b>Subject:</b> <b>Subject:</b>
<t t-esc="build_commit.commit_id.subject"/> <t t-out="build_commit.commit_id.subject"/>
<br/> <br/>
<b>Author:</b> <b>Author:</b>
<t t-esc="build_commit.commit_id.author"/> <t t-out="build_commit.commit_id.author"/>
<br/> <br/>
<b>Committer:</b> <b>Committer:</b>
<t t-esc="build_commit.commit_id.committer"/> <t t-out="build_commit.commit_id.committer"/>
<br/> <br/>
</div> </div>
</t> </t>
<b>Version:</b> <b>Version:</b>
<t t-esc="build.params_id.version_id.name"/> <t t-out="build.params_id.version_id.name"/>
<br/> <br/>
</div> </div>
</div> </div>
<div t-foreach="sorted(build_stats.keys())" t-as="category" class="col-md-4"> <div t-foreach="sorted(build_stats.keys())" t-as="category" class="col-md-4">
<h3><t t-esc="category.title().replace('_', ' ')"/></h3> <h3><t t-out="category.title().replace('_', ' ')"/></h3>
<table class="table table-condensed table-responsive table-stripped"> <table class="table table-condensed table-responsive table-stripped">
<tr t-foreach="build_stats[category].keys()" t-as="module"> <tr t-foreach="build_stats[category].keys()" t-as="module">
<td><t t-esc="module"/></td> <td><t t-out="module"/></td>
<td><t t-esc="build_stats[category][module]"/></td> <td><t t-out="build_stats[category][module]"/></td>
</tr> </tr>
</table> </table>
</div> </div>
@ -69,11 +69,11 @@
<div class="container-fluid"> <div class="container-fluid">
<nav class="navbar navbar-light"> <nav class="navbar navbar-light">
<div class="container"> <div class="container">
<b>Bundle:</b><t t-esc="bundle.name"/> <b>Bundle:</b><t t-out="bundle.name"/>
<b>Trigger:</b><t t-esc="trigger.name"/> <b>Trigger:</b><t t-out="trigger.name"/>
<b>Stat Category:</b> <b>Stat Category:</b>
<select id="key_category_selector" class="form-select" aria-label="Stat Category"> <select id="key_category_selector" class="form-select" aria-label="Stat Category">
<option t-foreach="stats_categories" t-as="category" t-attf-value="{{category}}"><t t-esc="category.replace('_',' ').title()"/></option> <option t-foreach="stats_categories" t-as="category" t-attf-value="{{category}}"><t t-out="category.replace('_',' ').title()"/></option>
</select> </select>
<b>Nb of builds:</b> <b>Nb of builds:</b>
<select id="limit_selector" class="form-select" aria-label="Number Of Builds"> <select id="limit_selector" class="form-select" aria-label="Number Of Builds">

14
runbot/templates/bundle.xml
View File

@ -8,7 +8,7 @@
<div class='col-md-12'> <div class='col-md-12'>
<div class="navbar navbar-default"> <div class="navbar navbar-default">
<span class="text-center" style="font-size: 18px;"> <span class="text-center" style="font-size: 18px;">
<t t-esc="bundle.name"/> <t t-out="bundle.name"/>
<i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" /> <i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" />
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a groups="runbot.group_runbot_advanced_user" t-attf-href="/web/#id={{bundle.id}}&amp;view_type=form&amp;model=runbot.bundle&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" class="btn btn-default" target="new" title="View in Backend"> <a groups="runbot.group_runbot_advanced_user" t-attf-href="/web/#id={{bundle.id}}&amp;view_type=form&amp;model=runbot.bundle&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" class="btn btn-default" target="new" title="View in Backend">
@ -55,7 +55,7 @@
<tr> <tr>
<td>Version</td> <td>Version</td>
<td> <td>
<t t-esc="bundle.version_id.name"/> <t t-out="bundle.version_id.name"/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -68,8 +68,8 @@
<div class="btn-group btn-group-ssm" role="group"> <div class="btn-group btn-group-ssm" role="group">
<a t-att-href="branch.branch_url" class="btn btn-default text-left" title="View Branch on Github"><i class="fa fa-github"/></a> <a t-att-href="branch.branch_url" class="btn btn-default text-left" title="View Branch on Github"><i class="fa fa-github"/></a>
<a groups="runbot.group_runbot_admin" class="btn btn-default fa fa-list text-left" t-attf-href="/web/#id={{branch.id}}&amp;view_type=form&amp;model=runbot.branch" target="new" title="View Branch in Backend"/> <a groups="runbot.group_runbot_admin" class="btn btn-default fa fa-list text-left" t-attf-href="/web/#id={{branch.id}}&amp;view_type=form&amp;model=runbot.branch" target="new" title="View Branch in Backend"/>
<a href="#" t-esc="branch.remote_id.short_name" class="btn btn-default disabled text-left"/> <a href="#" t-out="branch.remote_id.short_name" class="btn btn-default disabled text-left"/>
<a t-attf-href="/runbot/branch/{{branch.id}}" class="btn btn-default text-left" title="View Branch Details"><span t-att-class="'' if branch.alive else 'line-through'" t-esc="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/></a> <a t-attf-href="/runbot/branch/{{branch.id}}" class="btn btn-default text-left" title="View Branch Details"><span t-att-class="'' if branch.alive else 'line-through'" t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/></a>
<t t-if="not any (b.is_pr and b.alive for b in group[1]) and not branch.is_pr"> <t t-if="not any (b.is_pr and b.alive for b in group[1]) and not branch.is_pr">
<a t-attf-href="https://{{group[0].main_remote_id.base_url}}/compare/{{bundle.version_id.name}}...{{branch.remote_id.owner}}:{{branch.name}}?expand=1" class="btn btn-default text-left" title="Create pr"><i class="fa fa-code-fork"/> Create pr</a> <a t-attf-href="https://{{group[0].main_remote_id.base_url}}/compare/{{bundle.version_id.name}}...{{branch.remote_id.owner}}:{{branch.name}}?expand=1" class="btn btn-default text-left" title="Create pr"><i class="fa fa-code-fork"/> Create pr</a>
</t> </t>
@ -83,7 +83,7 @@
<tr t-if="more"> <tr t-if="more">
<td>Project</td> <td>Project</td>
<td t-esc="bundle.project_id.name"/> <td t-out="bundle.project_id.name"/>
</tr> </tr>
<tr t-if="more"> <tr t-if="more">
<td>New build enabled</td> <td>New build enabled</td>
@ -93,11 +93,11 @@
</tr> </tr>
<tr t-if="more"> <tr t-if="more">
<td>Modules</td> <td>Modules</td>
<td t-esc="bundle.modules or '/'"/> <td t-out="bundle.modules or '/'"/>
</tr> </tr>
</table> </table>
</div> </div>
<div t-foreach="bundle._consistency_warning()" t-as="warning" t-esc="warning[1]" t-attf-class="alert alert-{{warning[0]}}"/> <div t-foreach="bundle._consistency_warning()" t-as="warning" t-out="warning[1]" t-attf-class="alert alert-{{warning[0]}}"/>
<div class="batch_row" t-foreach="batchs" t-as="batch"> <div class="batch_row" t-foreach="batchs" t-as="batch">
<t t-call="runbot.batch_tile"/> <t t-call="runbot.batch_tile"/>
</div> </div>

42
runbot/templates/commit.xml
View File

@ -6,17 +6,17 @@
<td t-if="state=='pending'"> <td t-if="state=='pending'">
<i class="fa fa-circle text-warning"/> <i class="fa fa-circle text-warning"/>
&amp;nbsp; &amp;nbsp;
<t t-esc="state"/> <t t-out="state"/>
</td> </td>
<td t-if="state=='success'"> <td t-if="state=='success'">
<i class="fa fa-check text-success"/> <i class="fa fa-check text-success"/>
&amp;nbsp; &amp;nbsp;
<t t-esc="state"/> <t t-out="state"/>
</td> </td>
<td t-if="state in ('failure', 'error')"> <td t-if="state in ('failure', 'error')">
<i class="fa fa-times text-danger"/> <i class="fa fa-times text-danger"/>
&amp;nbsp; &amp;nbsp;
<t t-esc="state"/> <t t-out="state"/>
</td> </td>
</template> </template>
@ -29,7 +29,7 @@
<tr> <tr>
<td>Name</td> <td>Name</td>
<td> <td>
<t t-esc="commit.name"/> <t t-out="commit.name"/>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a t-att-href="'' if not reflogs else 'https://%s/commit/%s' % (reflogs[0].branch_id.remote_id.base_url, commit.name)" class="btn btn-sm text-start" title="View Commit on Github"><i class="fa fa-github"/></a> <a t-att-href="'' if not reflogs else 'https://%s/commit/%s' % (reflogs[0].branch_id.remote_id.base_url, commit.name)" class="btn btn-sm text-start" title="View Commit on Github"><i class="fa fa-github"/></a>
<a groups="runbot.group_runbot_admin" class="btn btn-sm fa fa-list text-start" t-attf-href="/web/#id={{commit.id}}&amp;view_type=form&amp;model=runbot.commit" target="new" title="View Commit in Backend"/> <a groups="runbot.group_runbot_admin" class="btn btn-sm fa fa-list text-start" t-attf-href="/web/#id={{commit.id}}&amp;view_type=form&amp;model=runbot.commit" target="new" title="View Commit in Backend"/>
@ -39,33 +39,33 @@
<tr> <tr>
<td>Tree hash</td> <td>Tree hash</td>
<td> <td>
<t t-esc="commit.tree_hash"/> <t t-out="commit.tree_hash"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Repo</td> <td>Repo</td>
<td t-esc="commit.repo_id.name"/> <td t-out="commit.repo_id.name"/>
</tr> </tr>
<tr> <tr>
<td>Subject</td> <td>Subject</td>
<td t-esc="commit.subject"/> <td t-out="commit.subject"/>
</tr> </tr>
<tr> <tr>
<td>Date</td> <td>Date</td>
<td t-esc="commit.date"/> <td t-out="commit.date"/>
</tr> </tr>
<tr> <tr>
<td>Author</td> <td>Author</td>
<td> <td>
<t t-esc="commit.author"/> <t t-out="commit.author"/>
<small t-esc="commit.author_email"/> <small t-out="commit.author_email"/>
</td> </td>
</tr> </tr>
<tr t-if="commit.author != commit.committer"> <tr t-if="commit.author != commit.committer">
<td>Commiter</td> <td>Commiter</td>
<td> <td>
<t t-esc="commit.committer"/> <t t-out="commit.committer"/>
<small t-esc="commit.committer_email"/> <small t-out="commit.committer_email"/>
</td> </td>
</tr> </tr>
</table> </table>
@ -76,15 +76,15 @@
<table class="table table-sm table-borderless"> <table class="table table-sm table-borderless">
<tr t-foreach='last_status_by_context' t-as='context'> <tr t-foreach='last_status_by_context' t-as='context'>
<t t-set="status" t-value="last_status_by_context[context]"/> <t t-set="status" t-value="last_status_by_context[context]"/>
<td t-esc="status.sent_date and status.sent_date.strftime('%Y-%m-%d %H:%M:%S') or '—'"/> <td t-out="status.sent_date and status.sent_date.strftime('%Y-%m-%d %H:%M:%S') or '—'"/>
<td t-esc="context"/> <td t-out="context"/>
<t t-call="runbot.commit_status_state_td"> <t t-call="runbot.commit_status_state_td">
<t t-set="state" t-value="status.state"/> <t t-set="state" t-value="status.state"/>
</t> </t>
<td> <td>
<a t-att-href="status.target_url"> <a t-att-href="status.target_url">
build build
<t t-if="status.target_url" t-esc="status.target_url.split('/')[-1]" /> <t t-if="status.target_url" t-out="status.target_url.split('/')[-1]" />
</a> </a>
</td> </td>
<td groups="base.group_user"> <td groups="base.group_user">
@ -101,9 +101,9 @@
<h3>Branch presence history</h3> <h3>Branch presence history</h3>
<table class="table table-stripped"> <table class="table table-stripped">
<tr t-foreach='reflogs' t-as='reflog'> <tr t-foreach='reflogs' t-as='reflog'>
<td t-esc="reflog.date"/> <td t-out="reflog.date"/>
<td t-esc="reflog.branch_id.remote_id.short_name"/> <td t-out="reflog.branch_id.remote_id.short_name"/>
<td><a t-attf-href="/runbot/branch/{{reflog.branch_id.id}}" t-esc="reflog.branch_id.name" title="View Branch Details"/></td> <td><a t-attf-href="/runbot/branch/{{reflog.branch_id.id}}" t-out="reflog.branch_id.name" title="View Branch Details"/></td>
</tr> </tr>
</table> </table>
</div> </div>
@ -111,15 +111,15 @@
<h3>Status history</h3> <h3>Status history</h3>
<table class="table table-stripped"> <table class="table table-stripped">
<tr t-foreach='status_list' t-as='status'> <tr t-foreach='status_list' t-as='status'>
<td t-esc="status.sent_date and status.sent_date.strftime('%Y-%m-%d %H:%M:%S') or '—'"/> <td t-out="status.sent_date and status.sent_date.strftime('%Y-%m-%d %H:%M:%S') or '—'"/>
<td t-esc="status.context"/> <td t-out="status.context"/>
<t t-call="runbot.commit_status_state_td"> <t t-call="runbot.commit_status_state_td">
<t t-set="state" t-value="status.state"/> <t t-set="state" t-value="status.state"/>
</t> </t>
<td> <td>
<a t-attf-href="/runbot/build/{{status.build_id.id}}"> <a t-attf-href="/runbot/build/{{status.build_id.id}}">
build build
<t t-esc="status.build_id.id" /> <t t-out="status.build_id.id" />
</a> </a>
</td> </td>
</tr> </tr>

38
runbot/templates/dashboard.xml
View File

@ -14,20 +14,20 @@
<div> <div>
<span t-attf-class="badge text-bg-{{pending_level}}"> <span t-attf-class="badge text-bg-{{pending_level}}">
Pending: Pending:
<t t-esc="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-esc="pending_assigned_count"/>)</span> <t t-out="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-out="pending_assigned_count"/>)</span>
</span> </span>
</div> </div>
<t t-set="project_id"/> <t t-set="project_id"/>
<t t-set="nb_project" t-value="len(bundles.mapped('project_id'))"/> <t t-set="nb_project" t-value="len(bundles.mapped('project_id'))"/>
<t t-foreach="bundles.sorted(lambda b: (-b.project_id.id, b.version_id.number), reverse=True)" t-as="bundle"> <t t-foreach="bundles.sorted(lambda b: (-b.project_id.id, b.version_id.number), reverse=True)" t-as="bundle">
<h3 t-if="nb_project > 1 and project_id != bundle.project_id.id" t-esc="bundle.project_id.name"/> <h3 t-if="nb_project > 1 and project_id != bundle.project_id.id" t-out="bundle.project_id.name"/>
<t t-set="project_id" t-value="bundle.project_id.id"/> <t t-set="project_id" t-value="bundle.project_id.id"/>
<h4> <h4>
<t t-esc="bundle.name"/> <t t-out="bundle.name"/>
</h4> </h4>
<t t-foreach="bundle.last_done_batch.slot_ids" t-as="slot"> <t t-foreach="bundle.last_done_batch.slot_ids" t-as="slot">
<span t-attf-class="badge text-bg-{{slot.build_id._get_color_class()}}"> <span t-attf-class="badge text-bg-{{slot.build_id._get_color_class()}}">
<t t-esc="slot.trigger_id.name"/> <t t-out="slot.trigger_id.name"/>
</span> </span>
</t> </t>
</t> </t>
@ -74,7 +74,7 @@
</div> </div>
<t t-foreach="hosts_data.sorted(key=lambda h:h.name)" t-as="host"> <t t-foreach="hosts_data.sorted(key=lambda h:h.name)" t-as="host">
<div> <div>
<span t-esc="host.name.split('.')[0]"/> <span t-out="host.name.split('.')[0]"/>
<t t-if="host.nb_testing == 0"> <t t-if="host.nb_testing == 0">
<t t-set="klass">success</t> <t t-set="klass">success</t>
</t> </t>
@ -88,11 +88,11 @@
<t t-set="klass">danger</t> <t t-set="klass">danger</t>
</t> </t>
<span t-attf-class="badge text-bg-{{klass}}"> <span t-attf-class="badge text-bg-{{klass}}">
<span t-esc="host.nb_testing"/> <span t-out="host.nb_testing"/>
/ /
<span t-esc="host.nb_worker"/> <span t-out="host.nb_worker"/>
</span> </span>
<t t-esc="host.nb_running"/> <t t-out="host.nb_running"/>
<t t-set="succes_time" t-value="int(datetime.datetime.now().timestamp() - host.last_success.timestamp())"/> <t t-set="succes_time" t-value="int(datetime.datetime.now().timestamp() - host.last_success.timestamp())"/>
<t t-set="start_time" t-value="int(datetime.datetime.now().timestamp() - host.last_start_loop.timestamp())"/> <t t-set="start_time" t-value="int(datetime.datetime.now().timestamp() - host.last_start_loop.timestamp())"/>
<t t-set="end_time" t-value="int(datetime.datetime.now().timestamp() - host.last_end_loop.timestamp())"/> <t t-set="end_time" t-value="int(datetime.datetime.now().timestamp() - host.last_end_loop.timestamp())"/>
@ -106,7 +106,7 @@
</t> </t>
<span t-attf-class="badge text-bg-{{klass}}"> <span t-attf-class="badge text-bg-{{klass}}">
<span t-esc="succes_time"/> <span t-out="succes_time"/>
</span> </span>
<t t-set="klass">success</t> <t t-set="klass">success</t>
@ -118,7 +118,7 @@
</t> </t>
<span t-attf-class="badge text-bg-{{klass}}"> <span t-attf-class="badge text-bg-{{klass}}">
<span t-esc="start_time"/> <span t-out="start_time"/>
</span> </span>
<t t-set="klass">success</t> <t t-set="klass">success</t>
@ -130,7 +130,7 @@
</t> </t>
<span t-attf-class="badge text-bg-{{klass}}"> <span t-attf-class="badge text-bg-{{klass}}">
<span t-esc="end_time"/> <span t-out="end_time"/>
</span> </span>
<t t-set="cron_time" t-value="end_time-start_time"/> <t t-set="cron_time" t-value="end_time-start_time"/>
@ -142,7 +142,7 @@
<t t-set="klass">danger</t> <t t-set="klass">danger</t>
</t> </t>
<span t-attf-class="badge text-bg-{{klass}}"> <span t-attf-class="badge text-bg-{{klass}}">
<span t-esc="cron_time"/> <span t-out="cron_time"/>
</span> </span>
</div> </div>
@ -151,7 +151,7 @@
<table> <table>
<tr t-foreach="bundles.sorted(lambda b: b.version_id.number, reverse=True)" t-as="bundle"> <tr t-foreach="bundles.sorted(lambda b: b.version_id.number, reverse=True)" t-as="bundle">
<td> <td>
<t t-esc="bundle.version_id.number"/> <t t-out="bundle.version_id.number"/>
</td> </td>
<td> <td>
<t t-set='batch' t-value="bundle.with_context({'category_id': category.id}).last_done_batch"/> <t t-set='batch' t-value="bundle.with_context({'category_id': category.id}).last_done_batch"/>
@ -159,7 +159,7 @@
<t t-foreach="batch.slot_ids" t-as='slot'> <t t-foreach="batch.slot_ids" t-as='slot'>
<tr> <tr>
<td> <td>
<t t-esc="slot.trigger_id.name[:4]"/> <t t-out="slot.trigger_id.name[:4]"/>
</td> </td>
<t t-set="build" t-value="slot.build_id"/> <t t-set="build" t-value="slot.build_id"/>
<td> <td>
@ -169,7 +169,7 @@
</td> </td>
<td t-foreach="build.children_ids" t-as="child"> <td t-foreach="build.children_ids" t-as="child">
<span t-attf-class="badge text-bg-{{slot.build_id._get_color_class()}}"> <span t-attf-class="badge text-bg-{{slot.build_id._get_color_class()}}">
<t t-esc="child.params_id.config_id.name[:4]"/> <t t-out="child.params_id.config_id.name[:4]"/>
</span> </span>
</td> </td>
</tr> </tr>
@ -188,16 +188,16 @@
<div class="col-md-3 col-lg-2 p-2"> <div class="col-md-3 col-lg-2 p-2">
<div class="card"> <div class="card">
<div class="card-header limited-height-toggle" t-attf-onclick="$('#tile_{{tile.id}}').toggleClass('limited-height')"> <div class="card-header limited-height-toggle" t-attf-onclick="$('#tile_{{tile.id}}').toggleClass('limited-height')">
<t t-esc="tile.display_name"/> <t t-if="tile.build_ids"> (<t t-esc="len(tile.build_ids)"/>)</t> <t t-out="tile.display_name"/> <t t-if="tile.build_ids"> (<t t-out="len(tile.build_ids)"/>)</t>
</div> </div>
<div class="card-body limited-height" t-attf-id="tile_{{tile.id}}"> <div class="card-body limited-height" t-attf-id="tile_{{tile.id}}">
<p t-if="not tile.build_ids" class="text-success my-0">No build found 👍</p> <p t-if="not tile.build_ids" class="text-success my-0">No build found 👍</p>
<t t-foreach="tile.sticky_bundle_ids.sorted(lambda b: b.version_id.number, reverse=True)" t-as="bundle"> <t t-foreach="tile.sticky_bundle_ids.sorted(lambda b: b.version_id.number, reverse=True)" t-as="bundle">
<t t-set="failed_builds" t-value="tile.build_ids.filtered(lambda b: b.top_parent.slot_ids.batch_id.bundle_id == bundle)"/> <t t-set="failed_builds" t-value="tile.build_ids.filtered(lambda b: b.top_parent.slot_ids.batch_id.bundle_id == bundle)"/>
<h4 class="card-title" t-if="failed_builds" t-esc="bundle.name"/> <h4 class="card-title" t-if="failed_builds" t-out="bundle.name"/>
<p t-foreach="failed_builds" t-as="build" class="my-0"> <p t-foreach="failed_builds" t-as="build" class="my-0">
<a class="text-danger" t-attf-href="/runbot/build/{{build.id}}" target="new"> <a class="text-danger" t-attf-href="/runbot/build/{{build.id}}" target="new">
<t t-esc="build.description or build.id"/> <t t-out="build.description or build.id"/>
</a> </a>
</p> </p>
</t> </t>
@ -243,7 +243,7 @@
<div class="one_line"> <div class="one_line">
<i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" /> <i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" />
<a t-attf-href="/runbot/bundle/#{bundle.id}" title="View Bundle"> <a t-attf-href="/runbot/bundle/#{bundle.id}" title="View Bundle">
<b t-esc="bundle.name"/> <b t-out="bundle.name"/>
</a> </a>
</div> </div>
<div class="badge text-bg-info" t-out="len(builds)"/> <div class="badge text-bg-info" t-out="len(builds)"/>

12
runbot/templates/frontend.xml
View File

@ -26,7 +26,7 @@
</div> </div>
<div class='col-md-12'> <div class='col-md-12'>
<div t-if="message" class="alert alert-warning" role="alert"> <div t-if="message" class="alert alert-warning" role="alert">
<t t-esc="message" /> <t t-out="message" />
</div> </div>
<div t-if="not project" class="mb32"> <div t-if="not project" class="mb32">
<h3>No project</h3> <h3>No project</h3>
@ -37,7 +37,7 @@
<div class="one_line"> <div class="one_line">
<i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" /> <i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" />
<a t-attf-href="/runbot/bundle/#{bundle.id}" t-attf-title="View Bundle #{bundle.name}"> <a t-attf-href="/runbot/bundle/#{bundle.id}" t-attf-title="View Bundle #{bundle.name}">
<b t-esc="bundle.name"/> <b t-out="bundle.name"/>
</a> </a>
</div> </div>
<div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
@ -62,7 +62,7 @@
</div> </div>
</div> </div>
<div t-if="bundle.host_id"> <div t-if="bundle.host_id">
<span class="badge text-bg-info" t-esc="bundle.host_id.name"></span> <span class="badge text-bg-info" t-out="bundle.host_id.name"></span>
</div> </div>
</div> </div>
<div class="col-md-9 col-lg-10"> <div class="col-md-9 col-lg-10">
@ -91,7 +91,7 @@
<a t-attf-href="/runbot/batch/#{batch.id}" title="View Batch"> <a t-attf-href="/runbot/batch/#{batch.id}" title="View Batch">
<div class="batch_header"> <div class="batch_header">
<span t-attf-class="badge text-bg-{{'warning' if batch.has_warning else 'default'}}"> <span t-attf-class="badge text-bg-{{'warning' if batch.has_warning else 'default'}}">
<t t-esc="batch._get_formated_age()"/> <t t-out="batch._get_formated_age()"/>
<i class="fa fa-exclamation-triangle" t-if="batch.has_warning"/> <i class="fa fa-exclamation-triangle" t-if="batch.has_warning"/>
</span> </span>
<span class="float-end header_hover">View batch...</span> <span class="float-end header_hover">View batch...</span>
@ -118,10 +118,10 @@
<i class="fa fa-fw fa-link" t-if="commit_link.match_type == 'head'" title="This commit is an existing head from bundle branches"/> <i class="fa fa-fw fa-link" t-if="commit_link.match_type == 'head'" title="This commit is an existing head from bundle branches"/>
<i class="fa fa-fw fa-code-fork" t-if="commit_link.match_type == 'base_match'" title="This commit is matched from a base batch with matching merge_base"/> <i class="fa fa-fw fa-code-fork" t-if="commit_link.match_type == 'base_match'" title="This commit is matched from a base batch with matching merge_base"/>
<i class="fa fa-fw fa-clock-o" t-if="commit_link.match_type == 'base_head'" title="This commit is the head of a base branch"/> <i class="fa fa-fw fa-clock-o" t-if="commit_link.match_type == 'base_head'" title="This commit is the head of a base branch"/>
<t t-esc="commit_link.commit_id.dname"/> <t t-out="commit_link.commit_id.dname"/>
</a> </a>
<a t-att-href="'https://%s/commit/%s' % (commit_link.branch_id.remote_id.base_url, commit_link.commit_id.name)" t-attf-class="badge text-bg-{{match_class}}" title="View Commit on Github"><i class="fa fa-github"/></a> <a t-att-href="'https://%s/commit/%s' % (commit_link.branch_id.remote_id.base_url, commit_link.commit_id.name)" t-attf-class="badge text-bg-{{match_class}}" title="View Commit on Github"><i class="fa fa-github"/></a>
<span t-esc="commit_link.commit_id.subject"/> <span t-out="commit_link.commit_id.subject"/>
</div> </div>
</div> </div>
</div> </div>

8
runbot/templates/git.xml
View File

@ -6,10 +6,10 @@
filemode = true filemode = true
bare = true bare = true
<t t-foreach="repo.remote_ids" t-as="remote_id"> <t t-foreach="repo.remote_ids" t-as="remote_id">
[remote "<t t-esc="remote_id.remote_name"/>"] [remote "<t t-out="remote_id.remote_name"/>"]
url = <t t-esc="remote_id.name"/> url = <t t-out="remote_id.name"/>
<t t-if = "remote_id.fetch_heads"> fetch = +refs/heads/*:refs/<t t-esc='remote_id.remote_name'/>/heads/*</t> <t t-if = "remote_id.fetch_heads"> fetch = +refs/heads/*:refs/<t t-out='remote_id.remote_name'/>/heads/*</t>
<t t-if = "remote_id.fetch_pull"> fetch = +refs/pull/*/head:refs/<t t-esc='remote_id.remote_name'/>/pull/*</t> <t t-if = "remote_id.fetch_pull"> fetch = +refs/pull/*/head:refs/<t t-out='remote_id.remote_name'/>/pull/*</t>
</t></template> </t></template>
</data> </data>
</odoo> </odoo>

32
runbot/templates/nginx.xml
View File

@ -2,8 +2,8 @@
<odoo> <odoo>
<data> <data>
<template id="runbot.nginx_config"> <template id="runbot.nginx_config">
pid <t t-esc="nginx_dir"/>/nginx.pid; pid <t t-out="nginx_dir"/>/nginx.pid;
error_log <t t-esc="nginx_dir"/>/error.log; error_log <t t-out="nginx_dir"/>/error.log;
worker_processes 1; worker_processes 1;
events { worker_connections 1024; } events { worker_connections 1024; }
http { http {
@ -16,10 +16,10 @@ index index.html;
log_format full '$remote_addr - $remote_user [$time_local] ' log_format full '$remote_addr - $remote_user [$time_local] '
'"$request" $status $body_bytes_sent ' '"$request" $status $body_bytes_sent '
'"$http_referer" "$http_user_agent" $request_time'; '"$http_referer" "$http_user_agent" $request_time';
access_log <t t-esc="nginx_dir"/>/access.log full; access_log <t t-out="nginx_dir"/>/access.log full;
error_log <t t-esc="nginx_dir"/>/error.log; error_log <t t-out="nginx_dir"/>/error.log;
client_body_temp_path <t t-esc="nginx_dir"/>; client_body_temp_path <t t-out="nginx_dir"/>;
fastcgi_temp_path <t t-esc="nginx_dir"/>; fastcgi_temp_path <t t-out="nginx_dir"/>;
autoindex on; autoindex on;
@ -33,7 +33,7 @@ map $http_x_forwarded_proto $real_scheme {
'' $scheme; '' $scheme;
} }
proxy_temp_path <t t-esc="nginx_dir"/>; proxy_temp_path <t t-out="nginx_dir"/>;
proxy_read_timeout 600; proxy_read_timeout 600;
proxy_connect_timeout 600; proxy_connect_timeout 600;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
@ -45,20 +45,20 @@ proxy_set_header X-Real-IP 127.0.0.42;
server { server {
listen 8080 default; listen 8080 default;
location /runbot/static/ { location /runbot/static/ {
alias <t t-esc="runbot_static"/>; alias <t t-out="runbot_static"/>;
autoindex off; autoindex off;
return 404; return 404;
location /runbot/static/src { } location /runbot/static/src { }
location ~ /runbot/static/build/[^/]+/(logs|tests|coverage)/ { location ~ /runbot/static/build/[^/]+/(logs|tests|coverage)/ {
autoindex on; autoindex on;
add_header 'Access-Control-Allow-Origin' '<t t-esc="base_url"/>'; add_header 'Access-Control-Allow-Origin' '<t t-out="base_url"/>';
} }
} }
} }
server { server {
listen 8080; listen 8080;
server_name ~^dockerhub\.<t t-esc="re_escape(host_name)"/>$; server_name ~^dockerhub\.<t t-out="re_escape(host_name)"/>$;
location /v2/ { location /v2/ {
limit_except GET HEAD OPTIONS { limit_except GET HEAD OPTIONS {
@ -79,22 +79,22 @@ server {
<t id="server_build_anchor"/> <t id="server_build_anchor"/>
server { server {
listen 8080; listen 8080;
server_name ~^<t t-out="re_escape(build.dest)"/>(-[a-z0-9_-]+)?-<t t-esc="build._get_run_token()[0]"/>(-[a-z0-9_]+)\.<t t-esc="re_escape(build.host)"/>$; server_name ~^<t t-out="re_escape(build.dest)"/>(-[a-z0-9_-]+)?-<t t-out="build._get_run_token()[0]"/>(-[a-z0-9_]+)\.<t t-out="re_escape(build.host)"/>$;
<t id="build_anchor_authenticated"/> <t id="build_anchor_authenticated"/>
location / { location / {
<t id="build_anchor_authenticated_side_effect"/> <t id="build_anchor_authenticated_side_effect"/>
return 307 http://<t t-out="build.dest"/>$1.<t t-esc="build.host"/>; return 307 http://<t t-out="build.dest"/>$1.<t t-out="build.host"/>;
} }
} }
server { server {
listen 8080; listen 8080;
server_name ~^<t t-out="re_escape(build.dest)"/>(-[a-z0-9_-]+)?\.<t t-esc="re_escape(build.host)"/>$; server_name ~^<t t-out="re_escape(build.dest)"/>(-[a-z0-9_-]+)?\.<t t-out="re_escape(build.host)"/>$;
<t id="build_anchor"/> <t id="build_anchor"/>
location / { proxy_pass http://127.0.0.1:<t t-esc="build.port"/>; } location / { proxy_pass http://127.0.0.1:<t t-out="build.port"/>; }
location /longpolling { proxy_pass http://127.0.0.1:<t t-esc="build.port + 1"/>; } location /longpolling { proxy_pass http://127.0.0.1:<t t-out="build.port + 1"/>; }
location /websocket { location /websocket {
proxy_pass http://127.0.0.1:<t t-esc="build.port + 1"/>; proxy_pass http://127.0.0.1:<t t-out="build.port + 1"/>;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Proto $real_scheme; proxy_set_header X-Forwarded-Proto $real_scheme;
proxy_set_header Host $host; proxy_set_header Host $host;

44
runbot/templates/utils.xml
View File

@ -5,7 +5,7 @@
<template id="runbot.base_page"> <template id="runbot.base_page">
<html t-att-data-bs-theme="theme"> <html t-att-data-bs-theme="theme">
<head> <head>
<title t-esc="title or 'Runbot'"/> <title t-out="title or 'Runbot'"/>
<link rel="stylesheet" type="text/css" href="/runbot/static/src/libs/bootstrap/css/bootstrap.css"/> <link rel="stylesheet" type="text/css" href="/runbot/static/src/libs/bootstrap/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="/runbot/static/src/libs/fontawesome/css/font-awesome.css"/> <link rel="stylesheet" type="text/css" href="/runbot/static/src/libs/fontawesome/css/font-awesome.css"/>
<link rel="stylesheet" type="text/css" href="/runbot/static/src/css/runbot.css"/> <link rel="stylesheet" type="text/css" href="/runbot/static/src/css/runbot.css"/>
@ -53,7 +53,7 @@
<nav class="navbar navbar-expand-md bg-body-tertiary"> <nav class="navbar navbar-expand-md bg-body-tertiary">
<a t-if="project" t-att-href="qu(search=search)"> <a t-if="project" t-att-href="qu(search=search)">
<b class="active_project"> <b class="active_project">
<t t-esc="project.name"/> <t t-out="project.name"/>
</b> </b>
</a> </a>
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#top_menu_collapse"> <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#top_menu_collapse">
@ -65,7 +65,7 @@
<t t-foreach="projects" t-as="l_project"> <t t-foreach="projects" t-as="l_project">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" t-att-href="qu('/runbot/%s' % slug(l_project), search=search)"> <a class="nav-link" t-att-href="qu('/runbot/%s' % slug(l_project), search=search)">
<t t-esc="l_project.name"/> <t t-out="l_project.name"/>
</a> </a>
</li> </li>
</t> </t>
@ -82,7 +82,7 @@
<li class="nav-item dropdown" t-ignore="true"> <li class="nav-item dropdown" t-ignore="true">
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
<b> <b>
<span t-esc="user_id.name[:23] + '...' if user_id.name and len(user_id.name) &gt; 25 else user_id.name"/> <span t-out="user_id.name[:23] + '...' if user_id.name and len(user_id.name) &gt; 25 else user_id.name"/>
</b> </b>
</a> </a>
<div class="dropdown-menu dropdown-menu-end js_usermenu" role="menu"> <div class="dropdown-menu dropdown-menu-end js_usermenu" role="menu">
@ -91,7 +91,7 @@
<div t-if="user_id.runbot_team_ids" class="dropdown-divider"/> <div t-if="user_id.runbot_team_ids" class="dropdown-divider"/>
<div t-if="user_id.runbot_team_ids" class="dropdown-header">Teams</div> <div t-if="user_id.runbot_team_ids" class="dropdown-header">Teams</div>
<a t-foreach="user_id.runbot_team_ids" t-as="team" class="dropdown-item" role="menuitem" t-attf-href="/runbot/teams/{{team.id}}"> <a t-foreach="user_id.runbot_team_ids" t-as="team" class="dropdown-item" role="menuitem" t-attf-href="/runbot/teams/{{team.id}}">
<t t-esc="team.name.capitalize()"/> <t t-out="team.name.capitalize()"/>
</a> </a>
</div> </div>
</li> </li>
@ -136,7 +136,7 @@
<div class="text-nowrap btn-group btn-group-sm" role="group"> <div class="text-nowrap btn-group btn-group-sm" role="group">
<t t-foreach="categories" t-as="category"> <t t-foreach="categories" t-as="category">
<button t-attf-onclick="document.cookie = 'category={{category.id}}; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if category.id == active_category_id else 'secondary'}}" t-esc="category.name"/> <button t-attf-onclick="document.cookie = 'category={{category.id}}; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if category.id == active_category_id else 'secondary'}}" t-out="category.name"/>
</t> </t>
</div> </div>
@ -146,12 +146,12 @@
<t t-foreach="categories" t-as="category"> <t t-foreach="categories" t-as="category">
<t t-set="category_triggers" t-value="triggers.filtered(lambda t: not t.manual and t.category_id == category)"/> <t t-set="category_triggers" t-value="triggers.filtered(lambda t: not t.manual and t.category_id == category)"/>
<t t-if="category_triggers"> <t t-if="category_triggers">
<h3 t-esc="category.name"/> <h3 t-out="category.name"/>
<div class="row"> <div class="row">
<t t-foreach="category_triggers" t-as="trigger"> <t t-foreach="category_triggers" t-as="trigger">
<div class="col-md-3 text-nowrap"> <div class="col-md-3 text-nowrap">
<input t-attf-class="trigger_selection {{'trigger_selection_hide' if trigger.hide else 'trigger_selection_show'}}" type="checkbox" t-attf-name="trigger_{{trigger.id}}" t-attf-id="trigger_{{trigger.id}}" t-att-checked="trigger_display is None or trigger.id in trigger_display"/> <input t-attf-class="trigger_selection {{'trigger_selection_hide' if trigger.hide else 'trigger_selection_show'}}" type="checkbox" t-attf-name="trigger_{{trigger.id}}" t-attf-id="trigger_{{trigger.id}}" t-att-checked="trigger_display is None or trigger.id in trigger_display"/>
<label t-attf-for="trigger_{{trigger.id}}" t-esc="trigger.name"/> <label t-attf-for="trigger_{{trigger.id}}" t-out="trigger.name"/>
</div> </div>
</t> </t>
</div> </div>
@ -181,8 +181,8 @@
<li class="nav-item"> <li class="nav-item">
<a href="/runbot/errors" class="nav-link text-danger" t-attf-title="You have {{nb_assigned_errors}} random bug assigned"> <a href="/runbot/errors" class="nav-link text-danger" t-attf-title="You have {{nb_assigned_errors}} random bug assigned">
<i class="fa fa-bug"/> <i class="fa fa-bug"/>
<t t-esc="nb_assigned_errors"/> <t t-out="nb_assigned_errors"/>
<span class="text-warning" t-if="nb_team_errors">+<t t-esc="nb_team_errors"/></span> <span class="text-warning" t-if="nb_team_errors">+<t t-out="nb_team_errors"/></span>
</a> </a>
</li> </li>
</t> </t>
@ -191,7 +191,7 @@
<li class="nav-item"> <li class="nav-item">
<a href="/runbot/errors" class="nav-link text-warning" t-attf-title="Your team has {{nb_team_errors}} random bug assigned"> <a href="/runbot/errors" class="nav-link text-warning" t-attf-title="Your team has {{nb_team_errors}} random bug assigned">
<i class="fa fa-bug"/> <i class="fa fa-bug"/>
<t t-esc="nb_team_errors"/> <t t-out="nb_team_errors"/>
</a> </a>
</li> </li>
</t> </t>
@ -207,7 +207,7 @@
<a href="/runbot/load_info" class="slots_infos"> <a href="/runbot/load_info" class="slots_infos">
<span t-attf-class="badge text-bg-{{pending_level}}"> <span t-attf-class="badge text-bg-{{pending_level}}">
Pending: Pending:
<t t-esc="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-esc="pending_assigned_count"/>)</span> <t t-out="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-out="pending_assigned_count"/>)</span>
</span> </span>
<t t-set="testing" t-value="hosts_data._total_testing()"/> <t t-set="testing" t-value="hosts_data._total_testing()"/>
<t t-set="workers" t-value="hosts_data._total_workers()"/> <t t-set="workers" t-value="hosts_data._total_workers()"/>
@ -220,9 +220,9 @@
</t> </t>
<span t-attf-class="badge text-bg-{{klass}}"> <span t-attf-class="badge text-bg-{{klass}}">
Testing: Testing:
<t t-esc="testing"/> <t t-out="testing"/>
/ /
<t t-esc="workers"/> <t t-out="workers"/>
</span> </span>
</a> </a>
</template> </template>
@ -235,10 +235,10 @@
<i t-attf-class="fa fa-{{slot._fa_link_type()}}"/> <i t-attf-class="fa fa-{{slot._fa_link_type()}}"/>
</span> </span>
<a t-if="bu" t-attf-href="/runbot/batch/{{slot.batch_id.id}}/build/#{bu.id}" t-attf-class="btn btn-default slot_name"> <a t-if="bu" t-attf-href="/runbot/batch/{{slot.batch_id.id}}/build/#{bu.id}" t-attf-class="btn btn-default slot_name">
<span t-esc="slot.trigger_id.name"/> <span t-out="slot.trigger_id.name"/>
</a> </a>
<span t-else="" t-attf-class="btn btn-default disabled slot_name"> <span t-else="" t-attf-class="btn btn-default disabled slot_name">
<span t-esc="slot.trigger_id.name"/> <span t-out="slot.trigger_id.name"/>
</span> </span>
<a t-if="slot.trigger_id.report_view_id" title="View last trigger report" t-attf-href="/runbot/trigger/report/{{slot.trigger_id.id}}" class="fa fa-eye btn btn-info"/> <a t-if="slot.trigger_id.report_view_id" title="View last trigger report" t-attf-href="/runbot/trigger/report/{{slot.trigger_id.id}}" class="fa fa-eye btn btn-info"/>
<a t-if="bu.local_state == 'running' and bu.database_ids" t-attf-href="/runbot/run/{{bu.id}}" class="fa fa-sign-in btn btn-info"/> <a t-if="bu.local_state == 'running' and bu.database_ids" t-attf-href="/runbot/run/{{bu.id}}" class="fa fa-sign-in btn btn-info"/>
@ -290,7 +290,7 @@
<t t-if="build.global_result == 'warn'"> <t t-if="build.global_result == 'warn'">
<t t-set="rowclass">warning</t> <t t-set="rowclass">warning</t>
</t> </t>
<t t-esc="rowclass"/> <t t-out="rowclass"/>
</template> </template>
<template id="runbot.build_menu"> <template id="runbot.build_menu">
@ -307,7 +307,7 @@
<t t-foreach="bu.database_ids[1:].sorted('name')" t-as="db"> <t t-foreach="bu.database_ids[1:].sorted('name')" t-as="db">
<a class="dropdown-item" t-attf-href="/runbot/run/{{bu.id}}/{{db.db_suffix}}"> <a class="dropdown-item" t-attf-href="/runbot/run/{{bu.id}}/{{db.db_suffix}}">
<i class="fa fa-sign-in"/> <i class="fa fa-sign-in"/>
Connect <t t-esc="db.db_suffix"></t> Connect <t t-out="db.db_suffix"></t>
</a> </a>
</t> </t>
<a class="dropdown-item" t-attf-href="http://{{bu.domain}}/web/database/selector"> <a class="dropdown-item" t-attf-href="http://{{bu.domain}}/web/database/selector">
@ -355,7 +355,7 @@
<a class="dropdown-item" t-attf-href="{{log_url}}/runbot/static/build/#{bu.dest}/logs/#{log_name}.txt"> <a class="dropdown-item" t-attf-href="{{log_url}}/runbot/static/build/#{bu.dest}/logs/#{log_name}.txt">
<i class="fa fa-file-text-o"/> <i class="fa fa-file-text-o"/>
Full Full
<t t-esc="log_name"/> <t t-out="log_name"/>
logs logs
</a> </a>
</t> </t>
@ -382,7 +382,7 @@
<t t-foreach="bundle.branch_ids.sorted(key=lambda b: (not b.alive, b.remote_id.repo_id.sequence, b.remote_id.repo_id.id, b.is_pr, b.id))" t-as="branch"> <t t-foreach="bundle.branch_ids.sorted(key=lambda b: (not b.alive, b.remote_id.repo_id.sequence, b.remote_id.repo_id.id, b.is_pr, b.id))" t-as="branch">
<t t-set="link_title" t-value="'View %s %s on Github' % ('PR' if branch.is_pr else 'Branch', branch.name)"/> <t t-set="link_title" t-value="'View %s %s on Github' % ('PR' if branch.is_pr else 'Branch', branch.name)"/>
<a t-att-href="branch.branch_url" class="dropdown-item" t-att-title="link_title"> <a t-att-href="branch.branch_url" class="dropdown-item" t-att-title="link_title">
<span class="font-italic text-muted" t-esc="branch.remote_id.short_name"/> <span t-att-class="'' if branch.alive else 'line-through'" t-esc="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/> <span class="font-italic text-muted" t-out="branch.remote_id.short_name"/> <span t-att-class="'' if branch.alive else 'line-through'" t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/>
</a> </a>
</t> </t>
</div> </div>
@ -404,11 +404,11 @@
<t t-foreach="project.trigger_ids.sorted(lambda t: (t.category_id.id, t.sequence, t.id))" t-as="trigger"> <t t-foreach="project.trigger_ids.sorted(lambda t: (t.category_id.id, t.sequence, t.id))" t-as="trigger">
<t t-if="trigger.has_stats and not trigger.manual" > <t t-if="trigger.has_stats and not trigger.manual" >
<t t-if="current_category != trigger.category_id"> <t t-if="current_category != trigger.category_id">
<span class="dropdown-item"><b><t t-esc="trigger.category_id.name"/></b></span> <span class="dropdown-item"><b><t t-out="trigger.category_id.name"/></b></span>
<t t-set="current_category" t-value="trigger.category_id"/> <t t-set="current_category" t-value="trigger.category_id"/>
</t> </t>
<a class="dropdown-item" t-attf-href="/runbot/stats/{{bundle.id}}/{{trigger.id}}"> <a class="dropdown-item" t-attf-href="/runbot/stats/{{bundle.id}}/{{trigger.id}}">
<t t-esc="trigger.name" /> <t t-out="trigger.name" />
</a> </a>
</t> </t>
</t> </t>

22
runbot_merge/views/templates.xml
View File

@ -19,7 +19,7 @@
t-att-title="title.strip()" t-att-title="title.strip()"
t-att-target="target or None" t-att-target="target or None"
t-att-class="classes or None" t-att-class="classes or None"
><t t-esc="pr.display_name"/></a> ><t t-out="pr.display_name"/></a>
</template> </template>
<template id="staging-statuses" name="dropdown statuses list of stagings"> <template id="staging-statuses" name="dropdown statuses list of stagings">
@ -50,7 +50,7 @@
else 'bg-danger' if st[0] in ('error', 'failure') else 'bg-danger' if st[0] in ('error', 'failure')
else 'bg-info' if st[0] else 'bg-info' if st[0]
else 'bg-light'}}"> else 'bg-light'}}">
<t t-esc="req.repo_id.name"/>: <t t-esc="req.context"/> <t t-out="req.repo_id.name"/>: <t t-out="req.context"/>
</a> </a>
</t> </t>
</div> </div>
@ -196,7 +196,7 @@
<li t-attf-class="staging {{stateclass.strip()}} {{decorationclass.strip()}}" t-att-title="title.strip() or None"> <li t-attf-class="staging {{stateclass.strip()}} {{decorationclass.strip()}}" t-att-title="title.strip() or None">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li t-foreach="staging.batch_ids" t-as="batch" class="batch"> <li t-foreach="staging.batch_ids" t-as="batch" class="batch">
<t t-esc="batch.prs[:1].label"/> <t t-out="batch.prs[:1].label"/>
<t t-foreach="batch.prs" t-as="pr"> <t t-foreach="batch.prs" t-as="pr">
<t t-call="runbot_merge.link-pr"/> <t t-call="runbot_merge.link-pr"/>
</t> </t>
@ -219,7 +219,7 @@
<t t-call="website.layout"> <t t-call="website.layout">
<div id="wrap"><div class="container-fluid"> <div id="wrap"><div class="container-fluid">
<section class="row"> <section class="row">
<h1 class="col-md-12"><t t-esc="branch.project_id.name"/>: <t t-esc="branch.name"/></h1> <h1 class="col-md-12"><t t-out="branch.project_id.name"/>: <t t-out="branch.name"/></h1>
</section> </section>
<form method="get"> <form method="get">
<label for="until">Staged before:</label> <label for="until">Staged before:</label>
@ -290,7 +290,7 @@
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false" aria-expanded="false"
> >
<t t-esc="first_pr.label"/> <t t-out="first_pr.label"/>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<div class="dropdown-menu"> <div class="dropdown-menu">
@ -321,7 +321,7 @@
<div id="wrap"><div class="container-fluid"> <div id="wrap"><div class="container-fluid">
<h1>Changelog</h1> <h1>Changelog</h1>
<section t-foreach="entries" t-as="entry"> <section t-foreach="entries" t-as="entry">
<h3 t-if="not entry_first" t-esc="entry"/> <h3 t-if="not entry_first" t-out="entry"/>
<ul> <ul>
<li t-foreach="sorted(entry_value)" t-as="item"> <li t-foreach="sorted(entry_value)" t-as="item">
<t t-out="item"/> <t t-out="item"/>
@ -336,14 +336,14 @@
<div class="alert alert-success"> <div class="alert alert-success">
Merged Merged
<t t-if="merged_head"> <t t-if="merged_head">
at <a t-attf-href="https://github.com/{{pr.repository.name}}/commit/{{merged_head}}"><t t-esc="merged_head"/></a> at <a t-attf-href="https://github.com/{{pr.repository.name}}/commit/{{merged_head}}"><t t-out="merged_head"/></a>
</t> </t>
<p>Statuses:</p> <p>Statuses:</p>
<ul> <ul>
<t t-foreach="pr.repository.status_ids._for_pr(pr)" t-as="ci"> <t t-foreach="pr.repository.status_ids._for_pr(pr)" t-as="ci">
<t t-set="st" t-value="statuses.get(ci.context.strip())"/> <t t-set="st" t-value="statuses.get(ci.context.strip())"/>
<li t-if="st"> <li t-if="st">
<a t-att-href="st.get('target_url') if st else None"><t t-esc="ci.context.strip()"/></a><t t-if="st and st.get('description')">: <t t-esc="st['description']"/></t> <a t-att-href="st.get('target_url') if st else None"><t t-out="ci.context.strip()"/></a><t t-if="st and st.get('description')">: <t t-out="st['description']"/></t>
</li> </li>
</t> </t>
</ul> </ul>
@ -367,7 +367,7 @@
<template id="view_pull_request_info_error"> <template id="view_pull_request_info_error">
<div class="alert alert-danger"> <div class="alert alert-danger">
Error: Error:
<span t-esc="pr.with_context(active_test=False).batch_id.staging_ids[-1:].reason"> <span t-out="pr.with_context(active_test=False).batch_id.staging_ids[-1:].reason">
Unable to stage PR Unable to stage PR
</span> </span>
</div> </div>
@ -410,7 +410,7 @@
<t t-else="">ok</t> <t t-else="">ok</t>
</t> </t>
<li t-att-class="result"> <li t-att-class="result">
<a t-att-href="st.get('target_url') if st else None"><t t-esc="ci.context.strip()"/></a><t t-if="st and st.get('description')">: <t t-esc="st['description']"/></t> <a t-att-href="st.get('target_url') if st else None"><t t-out="ci.context.strip()"/></a><t t-if="st and st.get('description')">: <t t-out="st['description']"/></t>
</li> </li>
</t> </t>
</ul> </ul>
@ -443,7 +443,7 @@
</h1> </h1>
<h6>Created by <span t-field="pr.author.display_name"/></h6> <h6>Created by <span t-field="pr.author.display_name"/></h6>
<t t-set="tmpl"> <t t-set="tmpl">
<t t-if="pr.state in ('merged', 'closed', 'error')"><t t-esc="pr.state"/></t> <t t-if="pr.state in ('merged', 'closed', 'error')"><t t-out="pr.state"/></t>
<t t-elif="pr.staging_id">staging</t> <t t-elif="pr.staging_id">staging</t>
<t t-else="">open</t> <t t-else="">open</t>
</t> </t>