Merge lp:~vauxoo/openerp-tools/runbot7_vauxoo_sums_links_dev_jorge into lp:~vauxoo/openerp-tools/runbot7_vauxoo_stable

Status: Merged
Merged at revision: 340
Proposed branch: lp:~vauxoo/openerp-tools/runbot7_vauxoo_sums_links_dev_jorge
Merge into: lp:~vauxoo/openerp-tools/runbot7_vauxoo_stable
Diff against target: 59 lines (+7/-5)
2 files modified
openerp-runbot/openerprunbot/templates/branches.vauxoo.html.mako (+3/-1)
openerp-runbot/openerprunbot/templates/defs.vauxoo.html.mako (+4/-4)
To merge this branch: bzr merge lp:~vauxoo/openerp-tools/runbot7_vauxoo_sums_links_dev_jorge
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Pending
Review via email: mp+208855@code.launchpad.net

Description of the change

Se agrega el sum de los sticky, mostrar los items de registred branches y los links para la localización de branches mas rápida por medio de su URL

To post a comment you must log in.
343. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com

[IMP]Fix id in name of branches

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp-runbot/openerprunbot/templates/branches.vauxoo.html.mako'
2--- openerp-runbot/openerprunbot/templates/branches.vauxoo.html.mako 2014-02-14 01:39:27 +0000
3+++ openerp-runbot/openerprunbot/templates/branches.vauxoo.html.mako 2014-02-28 18:49:46 +0000
4@@ -121,7 +121,7 @@
5 <div class="bs-docs-section clearfix">
6 <div class="navbar navbar-inverse">
7 <div class="navbar-header">
8- <a class="navbar-brand" href="#">Registered branches (not processed)</a>
9+ <a class="navbar-brand" href="#">Registered branches (not processed) (${len(r.nginx_groups_registered(team_name))} items)</a>
10 </div>
11 </div>
12 </div>
13@@ -155,6 +155,8 @@
14 ${r.current_job_id} processed jobs.<br />
15 ${r.workers - r.available_workers()} ongoing jobs.<br />
16 ${r.next_build_number} manual build requests to go.<br />
17+ <% sbt = sum( map( lambda a: a.sticky == True and 1 or 0, r.groups.values() ) ) %>
18+ Sticky Branches: ${sbt} <br />
19 </div>
20 </div>
21 </div>
22
23=== modified file 'openerp-runbot/openerprunbot/templates/defs.vauxoo.html.mako'
24--- openerp-runbot/openerprunbot/templates/defs.vauxoo.html.mako 2014-02-26 16:13:51 +0000
25+++ openerp-runbot/openerprunbot/templates/defs.vauxoo.html.mako 2014-02-28 18:49:46 +0000
26@@ -181,7 +181,7 @@
27
28 <%def name="set_heading(r,g)">
29 <div class="panel-heading">
30- <small>${g.name}</small>
31+ <small><a href="#${g.name.replace('.','_')}">${g.name}</a></small>
32 <div class="btn-toolbar pull-right">
33 <div class="btn-group btn-group-sm">
34 ${build_button_(r, g)}
35@@ -274,7 +274,7 @@
36 </%def>
37
38 <%def name="short_row_(r,g)">
39-<tr>
40+<tr id="${g.name.replace('.','_')}">
41 <th width="25%">
42 <div class="panel panel-default">
43 ${set_heading(r,g)}
44@@ -320,13 +320,13 @@
45
46
47 <%def name="simple_row(r,g)">
48-<tr>
49+<tr id="${g.name.replace('.','_')}">
50 <td>
51 <form method="POST" action="/a?build=${g.name}&amp;team=${g.team_name}">
52 % if g.build_number != sys.maxint:
53 <strong>${g.build_number}.</strong>
54 % endif
55- ${g.name}
56+ <a href="#${g.name.replace('.','_')}">${g.name}</a>
57 <span>(${g.team_name})</span>
58 % if g.build_number == sys.maxint:
59 <button type="submit" class="btn btn-success btn-xs"> Force Build <i class="fa fa-undo"></i></button>

Subscribers

People subscribed via source and target branches