Merge pull request #444 from abf/rosa-build:api-package-dependent-projects
Add dependent_projects into package
This commit is contained in:
commit
1155a74103
|
@ -1,7 +1,6 @@
|
||||||
json.build_list do
|
json.build_list do
|
||||||
json.(@build_list, :id, :container_status, :status, :duration)
|
json.(@build_list, :id, :container_status, :status, :duration)
|
||||||
json.(@build_list, :update_type, :priority, :new_core)
|
json.(@build_list, :update_type, :priority, :new_core)
|
||||||
json.(@build_list, :advisory, :mass_build)
|
|
||||||
json.(@build_list, :auto_publish_status, :package_version, :commit_hash, :last_published_commit_hash, :auto_create_container, :use_cached_chroot, :use_extra_tests)
|
json.(@build_list, :auto_publish_status, :package_version, :commit_hash, :last_published_commit_hash, :auto_create_container, :use_cached_chroot, :use_extra_tests)
|
||||||
json.build_log_url log_build_list_path(@build_list)
|
json.build_log_url log_build_list_path(@build_list)
|
||||||
|
|
||||||
|
@ -63,14 +62,22 @@ json.build_list do
|
||||||
|
|
||||||
json.extra_params @build_list.extra_params
|
json.extra_params @build_list.extra_params
|
||||||
|
|
||||||
json.advisory do
|
if @build_list.advisory
|
||||||
json.name @build_list.advisory.advisory_id
|
json.advisory do
|
||||||
json.(@build_list.advisory, :description)
|
json.name @build_list.advisory.advisory_id
|
||||||
end if @build_list.advisory
|
json.(@build_list.advisory, :description)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
json.advisory nil
|
||||||
|
end
|
||||||
|
|
||||||
json.mass_build do
|
if @build_list.mass_build
|
||||||
json.(@build_list.mass_build, :id, :name)
|
json.mass_build do
|
||||||
end if @build_list.mass_build
|
json.(@build_list.mass_build, :id, :name)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
json.mass_build nil
|
||||||
|
end
|
||||||
|
|
||||||
json.logs (@build_list.results || []) do |result|
|
json.logs (@build_list.results || []) do |result|
|
||||||
json.file_name result['file_name']
|
json.file_name result['file_name']
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
json.(package, :id, :name, :version, :release, :epoch)
|
json.(package, :id, :name, :version, :release, :epoch)
|
||||||
json.type package.package_type
|
json.type package.package_type
|
||||||
json.updated_at package.updated_at.to_i
|
json.updated_at package.updated_at.to_i
|
||||||
json.url (package.sha1 ? "#{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{package.sha1}" : '' )
|
json.url (package.sha1 ? "#{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{package.sha1}" : '' )
|
||||||
|
|
||||||
|
json.dependent_projects dependent_projects(package) do |project, packages|
|
||||||
|
json.partial! 'api/v1/projects/project', project: project
|
||||||
|
json.dependent_packages packages
|
||||||
|
end if package.build_list.save_to_platform.main?
|
Loading…
Reference in New Issue