Skip to content

Commit

Permalink
Merge pull request #6356 from ChrisBr/staging-api
Browse files Browse the repository at this point in the history
Add missing pieces to Staging API
  • Loading branch information
ChrisBr committed Nov 23, 2018
2 parents 1e2d4f2 + 506be2d commit b2579c5
Show file tree
Hide file tree
Showing 13 changed files with 2,696 additions and 91 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
builder.checks(count: checks.count) do
checks.each do |check|
render(partial: 'status/checks/check', locals: { object: check, builder: builder })
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
builder.missing_checks(count: missing_checks.count) do
missing_checks.each do |name|
builder.missing_check(name: name, state: :pending, required: true)
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
requests.each do |request|
builder.entry(id: request.number, creator: request.creator, state: request.state, package: request.first_target_package)
end

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
builder.staging_project(name: staging_project.name, state: staging_project.overall_state) do
builder.staged_requests(count: staging_project.staged_requests.count) do
render(partial: 'requests', locals: { requests: staging_project.staged_requests, builder: builder })
end
builder.untracked_requests(count: staging_project.untracked_requests.count) do
render(partial: 'requests', locals: { requests: staging_project.untracked_requests, builder: builder })
end
builder.requests_to_review(count: staging_project.requests_to_review.count) do
render(partial: 'requests', locals: { requests: staging_project.requests_to_review, builder: builder })
end
builder.obsolete_requests(count: staging_project.staged_requests.obsolete.count) do
render(partial: 'requests', locals: { requests: staging_project.staged_requests.obsolete, builder: builder })
end
render(partial: 'missing_reviews', locals: { missing_reviews: staging_project.missing_reviews, count: staging_project.missing_reviews.count, builder: builder })
render(partial: 'building_repositories', locals: { building_repositories: staging_project.building_repositories, count: staging_project.building_repositories.count, builder: builder })
render(partial: 'broken_packages', locals: { broken_packages: staging_project.broken_packages, count: staging_project.broken_packages.count, builder: builder })
render(partial: 'checks', locals: { checks: staging_project.checks, builder: builder })
render(partial: 'missing_checks', locals: { missing_checks: staging_project.missing_checks, builder: builder })
end

This file was deleted.

20 changes: 1 addition & 19 deletions src/api/app/views/staging/staging_projects/index.xml.builder
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
xml.staging_projects do
@staging_projects.each do |staging_project|
xml.staging_project(name: staging_project.name) do
render(partial: 'staging/staging_projects/staged_requests', locals: { staged_requests: staging_project.staged_requests,
count: staging_project.staged_requests.count, builder: xml })

render(partial: 'staging/staging_projects/untracked_requests', locals: { untracked_requests: staging_project.untracked_requests,
count: staging_project.untracked_requests.count, builder: xml })

render(partial: 'staging/staging_projects/requests_to_review', locals: { requests_to_review: staging_project.requests_to_review,
count: staging_project.requests_to_review.count, builder: xml })

render(partial: 'staging/staging_projects/missing_reviews', locals: { missing_reviews: staging_project.missing_reviews,
count: staging_project.missing_reviews.count, builder: xml })

render(partial: 'staging/staging_projects/building_repositories', locals: { building_repositories: staging_project.building_repositories,
count: staging_project.building_repositories.count, builder: xml })

render(partial: 'staging/staging_projects/broken_packages', locals: { broken_packages: staging_project.broken_packages,
count: staging_project.broken_packages.count, builder: xml })
end
render(partial: 'staging_project_item', locals: { staging_project: staging_project, builder: xml })
end
end
14 changes: 1 addition & 13 deletions src/api/app/views/staging/staging_projects/show.xml.builder
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
xml.staging_project(name: @staging_project.name) do
render(partial: 'staged_requests', locals: { staged_requests: @staging_project.staged_requests, count: @staging_project.staged_requests.count, builder: xml })

render(partial: 'untracked_requests', locals: { untracked_requests: @staging_project.untracked_requests, count: @staging_project.untracked_requests.count, builder: xml })

render(partial: 'requests_to_review', locals: { requests_to_review: @staging_project.requests_to_review, count: @staging_project.requests_to_review.count, builder: xml })

render(partial: 'missing_reviews', locals: { missing_reviews: @staging_project.missing_reviews, count: @staging_project.missing_reviews.count, builder: xml })

render(partial: 'building_repositories', locals: { building_repositories: @staging_project.building_repositories, count: @staging_project.building_repositories.count, builder: xml })

render(partial: 'broken_packages', locals: { broken_packages: @staging_project.broken_packages, count: @staging_project.broken_packages.count, builder: xml })
end
render(partial: 'staging_project_item', locals: { staging_project: @staging_project, builder: xml })

0 comments on commit b2579c5

Please sign in to comment.