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
=== modified file 'openerp-runbot/openerprunbot/templates/branches.vauxoo.html.mako'
--- openerp-runbot/openerprunbot/templates/branches.vauxoo.html.mako 2014-02-14 01:39:27 +0000
+++ openerp-runbot/openerprunbot/templates/branches.vauxoo.html.mako 2014-02-28 18:49:46 +0000
@@ -121,7 +121,7 @@
121 <div class="bs-docs-section clearfix">121 <div class="bs-docs-section clearfix">
122 <div class="navbar navbar-inverse">122 <div class="navbar navbar-inverse">
123 <div class="navbar-header">123 <div class="navbar-header">
124 <a class="navbar-brand" href="#">Registered branches (not processed)</a>124 <a class="navbar-brand" href="#">Registered branches (not processed) (${len(r.nginx_groups_registered(team_name))} items)</a>
125 </div>125 </div>
126 </div>126 </div>
127 </div>127 </div>
@@ -155,6 +155,8 @@
155 ${r.current_job_id} processed jobs.<br />155 ${r.current_job_id} processed jobs.<br />
156 ${r.workers - r.available_workers()} ongoing jobs.<br />156 ${r.workers - r.available_workers()} ongoing jobs.<br />
157 ${r.next_build_number} manual build requests to go.<br />157 ${r.next_build_number} manual build requests to go.<br />
158 <% sbt = sum( map( lambda a: a.sticky == True and 1 or 0, r.groups.values() ) ) %>
159 Sticky Branches: ${sbt} <br />
158 </div>160 </div>
159 </div>161 </div>
160 </div>162 </div>
161163
=== modified file 'openerp-runbot/openerprunbot/templates/defs.vauxoo.html.mako'
--- openerp-runbot/openerprunbot/templates/defs.vauxoo.html.mako 2014-02-26 16:13:51 +0000
+++ openerp-runbot/openerprunbot/templates/defs.vauxoo.html.mako 2014-02-28 18:49:46 +0000
@@ -181,7 +181,7 @@
181181
182<%def name="set_heading(r,g)">182<%def name="set_heading(r,g)">
183<div class="panel-heading">183<div class="panel-heading">
184 <small>${g.name}</small>184 <small><a href="#${g.name.replace('.','_')}">${g.name}</a></small>
185 <div class="btn-toolbar pull-right">185 <div class="btn-toolbar pull-right">
186 <div class="btn-group btn-group-sm">186 <div class="btn-group btn-group-sm">
187 ${build_button_(r, g)}187 ${build_button_(r, g)}
@@ -274,7 +274,7 @@
274</%def>274</%def>
275275
276<%def name="short_row_(r,g)">276<%def name="short_row_(r,g)">
277<tr>277<tr id="${g.name.replace('.','_')}">
278<th width="25%">278<th width="25%">
279<div class="panel panel-default">279<div class="panel panel-default">
280${set_heading(r,g)}280${set_heading(r,g)}
@@ -320,13 +320,13 @@
320320
321321
322<%def name="simple_row(r,g)">322<%def name="simple_row(r,g)">
323<tr>323<tr id="${g.name.replace('.','_')}">
324 <td>324 <td>
325 <form method="POST" action="/a?build=${g.name}&amp;team=${g.team_name}">325 <form method="POST" action="/a?build=${g.name}&amp;team=${g.team_name}">
326 % if g.build_number != sys.maxint:326 % if g.build_number != sys.maxint:
327 <strong>${g.build_number}.</strong>327 <strong>${g.build_number}.</strong>
328 % endif328 % endif
329 ${g.name}329 <a href="#${g.name.replace('.','_')}">${g.name}</a>
330 <span>(${g.team_name})</span>330 <span>(${g.team_name})</span>
331 % if g.build_number == sys.maxint:331 % if g.build_number == sys.maxint:
332 <button type="submit" class="btn btn-success btn-xs"> Force Build <i class="fa fa-undo"></i></button>332 <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