From 59f0cb64176adb44f0d26d14d673a322e3f99dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= Date: Thu, 8 Feb 2018 20:12:51 +0100 Subject: [PATCH 1/2] [frontend] Refactor parameter handling in build controller --- src/api/app/controllers/build_controller.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/api/app/controllers/build_controller.rb b/src/api/app/controllers/build_controller.rb index b11427c16c2..41801a27100 100644 --- a/src/api/app/controllers/build_controller.rb +++ b/src/api/app/controllers/build_controller.rb @@ -55,13 +55,7 @@ def project_index end if !allowed && !params[:package].nil? - package_names = nil - if params[:package].is_a? Array - package_names = params[:package] - else - package_names = [params[:package]] - end - package_names.each do |pack_name| + [params[:package]].flatten.each do |pack_name| pkg = Package.find_by_project_and_name(prj.name, pack_name) if pkg.nil? allowed = permissions.project_change? prj From 892f6958ec0df26c8c1f851b5cc23c0f4f28c5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= Date: Thu, 8 Feb 2018 20:23:55 +0100 Subject: [PATCH 2/2] [frontend] Refactor BuildControlle#result_lastsuccess Use Array#map instead of using a temporary variable to collect arch results. --- src/api/app/controllers/build_controller.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/api/app/controllers/build_controller.rb b/src/api/app/controllers/build_controller.rb index 41801a27100..3bd4d2dca8f 100644 --- a/src/api/app/controllers/build_controller.rb +++ b/src/api/app/controllers/build_controller.rb @@ -165,15 +165,12 @@ def result_lastsuccess bs = PackageBuildStatus.new(pkg).result(target_project: tprj, srcmd5: params[:srcmd5], multibuild_pkg: multibuild_package) @result = [] bs.each do |repo, status| - archs = [] - status.each do |arch, archstat| - oneline = [arch, archstat[:result]] + archs = status.map do |arch, archstat| if archstat[:missing].blank? - oneline << nil + [arch, archstat[:result], nil] else - oneline << archstat[:missing].join(',') + [arch, archstat[:result], archstat[:missing].join(',')] end - archs << oneline end @result << [repo, archs] end