Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit bb413cd97532e7f395dd4369fbe49f14a4e1e1f0
Author: clime <clime(a)redhat.com>
Date: Thu Jan 28 13:25:50 2016 +0100
[frontend] fix 1286334 - resubmit should offer other buildroots
---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_builds.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index 3b6ed1f..85066ef 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -468,11 +468,11 @@ def process_copr_repeat_build(build_id, copr):
build = ComplexLogic.get_build_safe(build_id)
if not flask.g.user.can_build_in(build.copr):
flask.flash("You are not allowed to repeat this build.")
- form = forms.BuildFormRebuildFactory.create_form_cls(build.chroots)(
+ form = forms.BuildFormRebuildFactory.create_form_cls(copr.active_chroots)(
build_id=build_id, enable_net=build.enable_net,
)
# remove all checkboxes by default
- for ch in build.chroots:
+ for ch in copr.active_chroots:
field = getattr(form, ch.name)
field.data = False
chroot_to_build = request.args.get("chroot")
@@ -482,13 +482,13 @@ def process_copr_repeat_build(build_id, copr):
if hasattr(form, chroot_to_build):
getattr(form, chroot_to_build).data = True
else:
- # set checkbox on the failed chroots
- chroots_to_select = set(ch.name for ch in build.get_chroots_by_status([
+ build_chroot_names = set(ch.name for ch in build.chroots)
+ build_failed_chroot_names = set(ch.name for ch in build.get_chroots_by_status([
helpers.StatusEnum('failed'),
helpers.StatusEnum('canceled'),
]))
-
- for ch in build.chroots:
- if ch.name in chroots_to_select:
+ for ch in copr.active_chroots:
+ # check checkbox on all the chroots that have not been (successfully) built
before
+ if (ch.name not in build_chroot_names) or (ch.name in
build_failed_chroot_names):
getattr(form, ch.name).data = True
return flask.render_template(
"coprs/detail/add_build/rebuild.html",