diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-05-12 15:10:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-17 14:43:30 +0100 |
commit | 74ae91e0bd29fe640cb4a3d5caf57cc5192860f7 (patch) | |
tree | b202bd044a216e839be97f9e008437bf9ecba8f6 | |
parent | d9d715b9f9ab72280e2c8522fa2c6f54ef5c1ea0 (diff) | |
download | poky-74ae91e0bd29fe640cb4a3d5caf57cc5192860f7.tar.gz |
bitbake: toaster: don't show "Rebuild" button for cancelled cli builds
[YOCTO #8515]
(Bitbake rev: 71a45c600e47af5a19412bc3c5a9ba242bfb4638)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/mrb_section.html | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index b5e798d7cc..212998a6b2 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html | |||
@@ -125,8 +125,6 @@ | |||
125 | pull-right" | 125 | pull-right" |
126 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" | 126 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" |
127 | data-target='{{build.target_set.all|get_tasks|json}}'> | 127 | data-target='{{build.target_set.all|get_tasks|json}}'> |
128 | |||
129 | |||
130 | Rebuild | 128 | Rebuild |
131 | </button> | 129 | </button> |
132 | {% endif %} | 130 | {% endif %} |
@@ -144,7 +142,7 @@ | |||
144 | <div class="lead span3 progress-info"><span id="build-pc-done-{{build.pk}}">{{build.completeper}}</span>% of tasks complete</div> | 142 | <div class="lead span3 progress-info"><span id="build-pc-done-{{build.pk}}">{{build.completeper}}</span>% of tasks complete</div> |
145 | {# No build cancel for command line builds project #} | 143 | {# No build cancel for command line builds project #} |
146 | {% if build.project.is_default %} | 144 | {% if build.project.is_default %} |
147 | <i class="icon-question-sign get-help get-help-blue pull-right" title="" data-original-title="Builds in this project cannot be cancelled from Toaster: they can only be cancalled from the command line"></i> | 145 | <i class="icon-question-sign get-help get-help-blue pull-right" title="" data-original-title="Builds in this project cannot be cancelled from Toaster: they can only be cancelled from the command line"></i> |
148 | {% else %} | 146 | {% else %} |
149 | <div class="lead pull-right progress-info"> | 147 | <div class="lead pull-right progress-info"> |
150 | <button class="cancel-build-btn btn btn-info pull-right" | 148 | <button class="cancel-build-btn btn btn-info pull-right" |
@@ -158,15 +156,20 @@ | |||
158 | {%endif%} {# end if in progress #} | 156 | {%endif%} {# end if in progress #} |
159 | 157 | ||
160 | {% if build.outcome == build.CANCELLED %} | 158 | {% if build.outcome == build.CANCELLED %} |
161 | <div class="span4"> | 159 | <div class="span4"> |
162 | <p class="lead">Build cancelled</p> | 160 | <p class="lead">Build cancelled</p> |
163 | </div> | 161 | </div> |
164 | <button class="btn btn-info pull-right run-again-btn" | ||
165 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" | ||
166 | data-target='{{build.target_set.all|get_tasks|json}}'> | ||
167 | Rebuild | ||
168 | 162 | ||
169 | </button> | 163 | {% if build.project.is_default %} |
164 | <i class="icon-question-sign get-help get-help-blue pull-right" title="" | ||
165 | data-original-title="Builds in this project cannot be rebuilt from Toaster: they can only be rebuilt from the command line"></i> | ||
166 | {% else %} | ||
167 | <button class="btn btn-info pull-right run-again-btn" | ||
168 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" | ||
169 | data-target='{{build.target_set.all|get_tasks|json}}'> | ||
170 | Rebuild | ||
171 | </button> | ||
172 | {% endif %} | ||
170 | {% endif %} | 173 | {% endif %} |
171 | </div> | 174 | </div> |
172 | </div> | 175 | </div> |