diff --git a/app/views/katello/api/v2/products/base.json.rabl b/app/views/katello/api/v2/products/base.json.rabl index 1c2c05cc1a1..c8394f08fc7 100644 --- a/app/views/katello/api/v2/products/base.json.rabl +++ b/app/views/katello/api/v2/products/base.json.rabl @@ -9,29 +9,9 @@ attributes :provider_id attributes :sync_plan_id attributes :sync_summary attributes :gpg_key_id -attributes :redhat? => :redhat attributes :available_content => :available_content, :if => params[:include_available_content] -node :sync_status do |product| - local_sync_status = product.sync_status - { - :id => local_sync_status[:id], - :product_id => local_sync_status[:product_id], - :progress => local_sync_status[:progress], - :sync_id => local_sync_status[:sync_id], - :state => local_sync_status[:state], - :raw_state => local_sync_status[:raw_state], - :start_time => local_sync_status[:start_time], - :finish_time => local_sync_status[:finish_time], - :duration => local_sync_status[:duration], - :display_size => local_sync_status[:display_size], - :size => local_sync_status[:size], - :is_running => local_sync_status[:is_running], - :error_details => local_sync_status[:error_details] - } -end - child :sync_plan do attributes :name, :description, :sync_date, :interval, :next_sync end diff --git a/app/views/katello/api/v2/products/show.json.rabl b/app/views/katello/api/v2/products/show.json.rabl index a8b7b74f81b..6f6be3ec352 100644 --- a/app/views/katello/api/v2/products/show.json.rabl +++ b/app/views/katello/api/v2/products/show.json.rabl @@ -3,12 +3,12 @@ object @resource extends "katello/api/v2/products/base" -extends 'katello/api/v2/common/org_reference' - attributes :productContent => :product_content attributes :available_content => :available_content +attributes :redhat? => :redhat + child :library_repositories => :repositories do |_repo| attributes :name, :id end @@ -21,6 +21,25 @@ child :provider do attribute :name end +node :sync_status do |product| + local_sync_status = product.sync_status + { + :id => local_sync_status[:id], + :product_id => local_sync_status[:product_id], + :progress => local_sync_status[:progress], + :sync_id => local_sync_status[:sync_id], + :state => local_sync_status[:state], + :raw_state => local_sync_status[:raw_state], + :start_time => local_sync_status[:start_time], + :finish_time => local_sync_status[:finish_time], + :duration => local_sync_status[:duration], + :display_size => local_sync_status[:display_size], + :size => local_sync_status[:size], + :is_running => local_sync_status[:is_running], + :error_details => local_sync_status[:error_details] + } +end + node :permissions do |product| { :view_products => product.readable?,