Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Restore individual cancel-build buttons

These were hidden by an errant edit when web auth was added.
Previously, the buttons would only be displayed when a username/password
form was not required; that unique logic is no longer necessary.
  • Loading branch information...
commit 8a8f18b4f0b3dcdf29f3cd703aae83925db0a71a 1 parent bec38d2
Dustin J. Mitchell djmitche authored

Showing 1 changed file with 14 additions and 16 deletions. Show diff stats Hide diff stats

  1. +14 16 master/buildbot/status/web/templates/forms.html
30 master/buildbot/status/web/templates/forms.html
... ... @@ -1,22 +1,20 @@
1 1
2 2 {% macro cancel_pending_build(cancel_url, authz, short=False, id='all') %}
3   - {% if not short %}
4   - <form method="post" name="cancel" action="{{ cancel_url }}" class='command cancelbuild'
5   - {{ 'style="display:inline"' if short else '' }}>
6   - {% if not short %}
7   - {% if id == 'all' %}
8   - <p>To cancel all builds, fill out the following fields and
9   - push the 'Cancel' button</p>
10   - <p>To cancel individual builds, click the 'Cancel' buttons above.</p>
11   - {% else %}
12   - <p>To cancel this build, fill out the following fields and
13   - push the 'Cancel' button</p>
14   - {% endif %}
  3 + <form method="post" name="cancel" action="{{ cancel_url }}" class='command cancelbuild'
  4 + {{ 'style="display:inline"' if short else '' }}>
  5 + {% if not short %}
  6 + {% if id == 'all' %}
  7 + <p>To cancel all builds, fill out the following fields and
  8 + push the 'Cancel' button</p>
  9 + <p>To cancel individual builds, click the 'Cancel' buttons above.</p>
  10 + {% else %}
  11 + <p>To cancel this build, fill out the following fields and
  12 + push the 'Cancel' button</p>
15 13 {% endif %}
16   - <input type="hidden" name="id" value="{{ id }}" />
17   - <input type="submit" value="Cancel" />
18   - </form>
19   - {% endif %}
  14 + {% endif %}
  15 + <input type="hidden" name="id" value="{{ id }}" />
  16 + <input type="submit" value="Cancel" />
  17 + </form>
20 18 {% endmacro %}
21 19
22 20 {% macro stop_change_builds(stopchange_url, changenum, authz) %}

0 comments on commit 8a8f18b

Please sign in to comment.
Something went wrong with that request. Please try again.