From c35d42c6fbf78c9d3c4f169ea88552a4c7826ff1 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Mon, 18 Mar 2019 21:12:33 +0300 Subject: [PATCH] pass platform_name into builder, fix use_extr_tests always enabled state --- app/models/build_list.rb | 3 ++- .../new_build/_extra_params_and_preferences.html.slim | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/build_list.rb b/app/models/build_list.rb index c69bae0d0..e316fbd3c 100644 --- a/app/models/build_list.rb +++ b/app/models/build_list.rb @@ -526,7 +526,8 @@ class BuildList < ActiveRecord::Base 'EXTRA_CFG_OPTIONS' => extra_params['cfg_options'], 'EXTRA_CFG_URPM_OPTIONS' => extra_params['cfg_urpm_options'], 'EXTRA_BUILD_SRC_RPM_OPTIONS' => extra_params['build_src_rpm'], - 'EXTRA_BUILD_RPM_OPTIONS' => extra_params['build_rpm'] + 'EXTRA_BUILD_RPM_OPTIONS' => extra_params['build_rpm'], + 'PLATFORM_NAME' => build_for_platform.name } cmd_params.merge!( 'RERUN_TESTS' => true, diff --git a/app/views/projects/build_lists/new_build/_extra_params_and_preferences.html.slim b/app/views/projects/build_lists/new_build/_extra_params_and_preferences.html.slim index 8867cb291..8cc658b95 100644 --- a/app/views/projects/build_lists/new_build/_extra_params_and_preferences.html.slim +++ b/app/views/projects/build_lists/new_build/_extra_params_and_preferences.html.slim @@ -27,9 +27,7 @@ h4.offset10= t("activerecord.attributes.build_list.preferences") label - checked = params[:build_list].try(:[], kind) || kind == :use_cached_chroot - checked = @build_list.send(kind) if checked.nil? - input[type= 'checkbox' - checked= checked - name= "build_list[#{kind}]" ] + = f.check_box kind, {}, "true", "false" = BuildList.human_attribute_name kind - selected = params[:build_list].try(:[], :external_nodes)