Skip to content

Commit

Permalink
Merge pull request #4475 from bgeuken/refactor_build_controller
Browse files Browse the repository at this point in the history
Refactor build controller
  • Loading branch information
hennevogel committed Feb 12, 2018
2 parents 6b1b704 + 892f695 commit 4a857e2
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions src/api/app/controllers/build_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -171,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
Expand Down

0 comments on commit 4a857e2

Please sign in to comment.