diff --git a/app/views/admin/enterprises/_supplied_product.rabl b/app/views/admin/enterprises/_supplied_product.rabl deleted file mode 100644 index 268ff302d5..0000000000 --- a/app/views/admin/enterprises/_supplied_product.rabl +++ /dev/null @@ -1,10 +0,0 @@ -object @product - -attributes :name -node(:supplier_name) { |p| p.supplier.andand.name } -node(:image_url) { |p| p.images.present? ? p.images.first.attachment.url(:mini) : nil } -node(:master_id) { |p| p.master.id } -child variants: :variants do |variant| - attributes :id - node(:label) { |v| v.options_text } -end diff --git a/app/views/admin/enterprises/index.rabl b/app/views/admin/enterprises/index.rabl index 1342d6eb1a..9e1ee893d1 100644 --- a/app/views/admin/enterprises/index.rabl +++ b/app/views/admin/enterprises/index.rabl @@ -2,8 +2,13 @@ collection @collection attributes :id, :name -node(:supplied_products) do |enterprise| - enterprise.supplied_products.not_deleted.map do |product| - partial 'admin/enterprises/supplied_product', object: product +child supplied_products: :supplied_products do |product| + attributes :name + node(:supplier_name) { |p| p.supplier.andand.name } + node(:image_url) { |p| p.images.present? ? p.images.first.attachment.url(:mini) : nil } + node(:master_id) { |p| p.master.id } + child variants: :variants do |variant| + attributes :id + node(:label) { |v| v.options_text } end end diff --git a/spec/views/admin/enterprises/index.rabl_spec.rb b/spec/views/admin/enterprises/index.rabl_spec.rb deleted file mode 100644 index e92388da61..0000000000 --- a/spec/views/admin/enterprises/index.rabl_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'spec_helper' - -describe "admin/enterprises/index.rabl" do - let(:enterprise) { create(:distributor_enterprise) } - let!(:product) { create(:simple_product, supplier: enterprise) } - let!(:deleted_product) { create(:simple_product, supplier: enterprise, deleted_at: Time.now) } - let(:render) { Rabl.render([enterprise], 'admin/enterprises/index', view_path: 'app/views', scope: RablHelper::FakeContext.instance) } - - describe "supplied products" do - it "does not render deleted products" do - render.should have_json_size(1).at_path '0/supplied_products' - render.should be_json_eql(product.master.id).at_path '0/supplied_products/0/master_id' - end - end -end