Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/builder.html (120451 => 120452)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/builder.html 2012-06-15 14:10:36 UTC (rev 120451)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/builder.html 2012-06-15 14:14:43 UTC (rev 120452)
@@ -21,7 +21,7 @@
{{ b.current_step }}
- {% if authz.advertiseAction('stopBuild') %}
+ {% if authz.advertiseAction('stopBuild', request) %}
{{ forms.stop_build(b.stop_url, authz, _on_all_=False, short=True, label='Build') }}
{% endif %}
</li>
@@ -37,7 +37,7 @@
{% for b in pending %}
<li><small>({{ b.when }}, waiting {{ b.delay }})</small>
- {% if authz.advertiseAction('cancelPendingBuild') %}
+ {% if authz.advertiseAction('cancelPendingBuild', request) %}
{{ forms.cancel_pending_build(builder_url+"/cancelbuild", authz, short=True, id=b.id) }}
{% endif %}
@@ -49,11 +49,16 @@
({{ b.num_changes }} changes)
{% endif %}
+ {% if 'owner' in b.properties %}
+ <b>Forced build</b>
+ by {{b.properties['owner'][0]}}
+ <small>{{b.properties['reason'][0]}}</small>
+ {% endif %}
</li>
{% endfor %}
</ul>
- {% if authz.advertiseAction('cancelPendingBuild') %}
+ {% if authz.advertiseAction('cancelPendingBuild', request) %}
{{ forms.cancel_pending_build(builder_url+"/cancelbuild", authz, short=False, id='all') }}
{% endif %}
@@ -97,14 +102,14 @@
{% endfor %}
</table>
-{% if authz.advertiseAction('pingBuilder') %}
+{% if authz.advertiseAction('pingBuilder', request) %}
<h2>Ping slaves</h2>
{{ forms.ping_builder(builder_url+"/ping", authz) }}
{% endif %}
-{% if authz.advertiseAction('forceBuild') %}
+{% if authz.advertiseAction('forceBuild', request) and force_schedulers != {} %}
<h2>Force build</h2>
- {{ forms.force_build(builder_url+"/force", authz, False) }}
+ {{ forms.force_build(builder_url+"/force", authz, request, False, force_schedulers=force_schedulers,default_props=default_props) }}
{% endif %}
</div>
Modified: trunk/Tools/ChangeLog (120451 => 120452)
--- trunk/Tools/ChangeLog 2012-06-15 14:10:36 UTC (rev 120451)
+++ trunk/Tools/ChangeLog 2012-06-15 14:14:43 UTC (rev 120452)
@@ -1,5 +1,16 @@
2012-06-15 Csaba Osztrogonác <[email protected]>
+ Update builder.html template for newer buildmaster
+ https://bugs.webkit.org/show_bug.cgi?id=89207
+
+ Rebasing builder.html template from v0.8.3 to v0.8.6p1.
+
+ Reviewed by Zoltan Herczeg.
+
+ * BuildSlaveSupport/build.webkit.org-config/templates/builder.html:
+
+2012-06-15 Csaba Osztrogonác <[email protected]>
+
Add ForceScheduler to build.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=88982
