From d52c1fa5daeb6cbc8310e94b4e4c078ed07f8a7b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 3 Jun 2014 12:18:27 +1000
Subject: [PATCH] Revert "Do not show deleted products in order cycle admin"

This reverts commit 4e45a682fd6e93a54b273fda611091c6a286854d.
---
 .../admin/enterprises/_supplied_product.rabl      | 10 ----------
 app/views/admin/enterprises/index.rabl            | 11 ++++++++---
 spec/views/admin/enterprises/index.rabl_spec.rb   | 15 ---------------
 3 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 app/views/admin/enterprises/_supplied_product.rabl
 delete mode 100644 spec/views/admin/enterprises/index.rabl_spec.rb

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