Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refs #7706 - extend errata in systems/erratum rabl #4831

Merged
merged 1 commit into from
Dec 1, 2014
Merged

refs #7706 - extend errata in systems/erratum rabl #4831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions app/controllers/katello/api/v2/systems_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ def refresh_subscriptions
param :id, String, :desc => N_("UUID of the content host"), :required => true
param :content_view_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Content View"), :required => false
param :environment_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Environment"), :required => false
param_group :search, Api::V2::ApiController
def errata
if params[:content_view_id] && params[:environment_id]
find_content_view
Expand Down
2 changes: 1 addition & 1 deletion app/views/katello/api/v2/errata/show.json.rabl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ object @resource

attributes :uuid => :id
attributes :title, :errata_id
attributes :issued, :updated
attributes :issued, :updated, :version, :status, :release
attributes :severity, :description, :solution, :summary, :reboot_suggested
attributes :_href
attributes :cves
Expand Down
9 changes: 1 addition & 8 deletions app/views/katello/api/v2/systems/erratum.json.rabl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
attributes :title, :version, :description, :status, :id, :errata_id
attributes :reboot_suggested, :updated, :issued, :release, :solution

node :packages do |e|
e.packages.pluck(:nvrea).sort
end

attributes :errata_type => :type
extends("katello/api/v2/errata/show")

node :available do |e|
@available_errata_ids.include?(e.id) if @available_errata_ids
Expand Down