From aa1c28b163c8cd77246f028890f05aaaba47f0f3 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 11 Apr 2014 10:09:25 +1000 Subject: [PATCH] Move enterprises api controller out of spree namespace --- app/controllers/api/enterprises_controller.rb | 10 ++++++++++ app/controllers/spree/api/enterprises_controller.rb | 12 ------------ app/views/api/enterprises/bulk_index.v1.rabl | 2 ++ .../{spree => }/api/enterprises/bulk_show.v1.rabl | 0 app/views/api/order_cycles/bulk_show.v1.rabl | 4 ++-- app/views/spree/api/enterprises/bulk_index.v1.rabl | 2 -- app/views/spree/api/line_items/bulk_show.v1.rabl | 2 +- app/views/spree/api/orders/bulk_show.v1.rabl | 2 +- app/views/spree/api/products/bulk_show.v1.rabl | 2 +- config/routes.rb | 7 +++---- 10 files changed, 20 insertions(+), 23 deletions(-) create mode 100644 app/controllers/api/enterprises_controller.rb delete mode 100644 app/controllers/spree/api/enterprises_controller.rb create mode 100644 app/views/api/enterprises/bulk_index.v1.rabl rename app/views/{spree => }/api/enterprises/bulk_show.v1.rabl (100%) delete mode 100644 app/views/spree/api/enterprises/bulk_index.v1.rabl diff --git a/app/controllers/api/enterprises_controller.rb b/app/controllers/api/enterprises_controller.rb new file mode 100644 index 0000000000..102c237c95 --- /dev/null +++ b/app/controllers/api/enterprises_controller.rb @@ -0,0 +1,10 @@ +module Api + class EnterprisesController < Spree::Api::BaseController + respond_to :json + + def managed + @enterprises = Enterprise.ransack(params[:q]).result.managed_by(current_api_user) + respond_with(@enterprises) + end + end +end diff --git a/app/controllers/spree/api/enterprises_controller.rb b/app/controllers/spree/api/enterprises_controller.rb deleted file mode 100644 index 4057def67a..0000000000 --- a/app/controllers/spree/api/enterprises_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -module Spree - module Api - class EnterprisesController < Spree::Api::BaseController - respond_to :json - - def managed - @enterprises = Enterprise.ransack(params[:q]).result.managed_by(current_api_user) - respond_with(@enterprises) - end - end - end -end diff --git a/app/views/api/enterprises/bulk_index.v1.rabl b/app/views/api/enterprises/bulk_index.v1.rabl new file mode 100644 index 0000000000..66286c5fed --- /dev/null +++ b/app/views/api/enterprises/bulk_index.v1.rabl @@ -0,0 +1,2 @@ +collection @enterprises +extends "api/enterprises/bulk_show" diff --git a/app/views/spree/api/enterprises/bulk_show.v1.rabl b/app/views/api/enterprises/bulk_show.v1.rabl similarity index 100% rename from app/views/spree/api/enterprises/bulk_show.v1.rabl rename to app/views/api/enterprises/bulk_show.v1.rabl diff --git a/app/views/api/order_cycles/bulk_show.v1.rabl b/app/views/api/order_cycles/bulk_show.v1.rabl index 814985ef53..a0a5b16927 100644 --- a/app/views/api/order_cycles/bulk_show.v1.rabl +++ b/app/views/api/order_cycles/bulk_show.v1.rabl @@ -2,8 +2,8 @@ object @order_cycle attributes :id, :name node( :suppliers ) do |oc| - partial 'spree/api/enterprises/bulk_index', :object => oc.suppliers + partial 'api/enterprises/bulk_index', :object => oc.suppliers end node( :distributors ) do |oc| - partial 'spree/api/enterprises/bulk_index', :object => oc.distributors + partial 'api/enterprises/bulk_index', :object => oc.distributors end \ No newline at end of file diff --git a/app/views/spree/api/enterprises/bulk_index.v1.rabl b/app/views/spree/api/enterprises/bulk_index.v1.rabl deleted file mode 100644 index f84733b401..0000000000 --- a/app/views/spree/api/enterprises/bulk_index.v1.rabl +++ /dev/null @@ -1,2 +0,0 @@ -collection @enterprises -extends "spree/api/enterprises/bulk_show" diff --git a/app/views/spree/api/line_items/bulk_show.v1.rabl b/app/views/spree/api/line_items/bulk_show.v1.rabl index a69bfef2d1..8b53c42086 100644 --- a/app/views/spree/api/line_items/bulk_show.v1.rabl +++ b/app/views/spree/api/line_items/bulk_show.v1.rabl @@ -1,5 +1,5 @@ object @line_item attributes :id, :quantity, :max_quantity -node( :supplier ) { |li| partial 'spree/api/enterprises/bulk_show', :object => li.product.supplier } +node( :supplier ) { |li| partial 'api/enterprises/bulk_show', :object => li.product.supplier } node( :units_product ) { |li| partial 'spree/api/products/units_show', :object => li.product } node( :units_variant ) { |li| partial 'spree/api/variants/units_show', :object => li.variant } \ No newline at end of file diff --git a/app/views/spree/api/orders/bulk_show.v1.rabl b/app/views/spree/api/orders/bulk_show.v1.rabl index 28459fb87e..09c8cc3dfd 100644 --- a/app/views/spree/api/orders/bulk_show.v1.rabl +++ b/app/views/spree/api/orders/bulk_show.v1.rabl @@ -5,7 +5,7 @@ node( :full_name ) { |order| order.billing_address.nil? ? "" : ( order.billing_a node( :email ) { |order| order.email || "" } node( :phone ) { |order| order.billing_address.nil? ? "a" : ( order.billing_address.phone || "" ) } node( :completed_at ) { |order| order.completed_at.blank? ? "" : order.completed_at.strftime("%F %T") } -node( :distributor ) { |order| partial 'spree/api/enterprises/bulk_show', :object => order.distributor } +node( :distributor ) { |order| partial 'api/enterprises/bulk_show', :object => order.distributor } node( :order_cycle ) { |order| partial 'api/order_cycles/bulk_show', :object => order.order_cycle } node( :line_items ) do |order| order.line_items.order('id ASC').map do |line_item| diff --git a/app/views/spree/api/products/bulk_show.v1.rabl b/app/views/spree/api/products/bulk_show.v1.rabl index 37a4680e2f..1e7cf4d9ea 100644 --- a/app/views/spree/api/products/bulk_show.v1.rabl +++ b/app/views/spree/api/products/bulk_show.v1.rabl @@ -8,7 +8,7 @@ node( :price ) { |p| p.price.nil? ? '0.0' : p.price } node( :available_on ) { |p| p.available_on.blank? ? "" : p.available_on.strftime("%F %T") } node( :permalink_live ) { |p| p.permalink } node( :supplier ) do |p| - partial 'spree/api/enterprises/bulk_show', :object => p.supplier + partial 'api/enterprises/bulk_show', :object => p.supplier end node( :variants ) do |p| partial 'spree/api/variants/bulk_index', :object => p.variants.reorder('spree_variants.id ASC') diff --git a/config/routes.rb b/config/routes.rb index a218fb145e..301315857b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -49,6 +49,9 @@ Openfoodnetwork::Application.routes.draw do end namespace :api do + resources :enterprises do + get :managed, on: :collection + end resources :order_cycles do get :managed, on: :collection end @@ -107,10 +110,6 @@ Spree::Core::Engine.routes.prepend do resources :orders do get :managed, on: :collection end - - resources :enterprises do - get :managed, on: :collection - end end namespace :admin do