raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 3-0-stable-apr3

Browse Source
This commit is contained in:
Luis Ramos
2020-04-03 18:26:26 +01:00
parent a218eab67b e64d573337
commit 384ca310a3
126 changed files with 7012 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/customers_controller.rb
View File

@@ -1,5 +1,5 @@
module Api
class CustomersController < BaseController
class CustomersController < Api::BaseController
skip_authorization_check only: :index
def index

2
app/controllers/api/enterprise_attachment_controller.rb
View File

@@ -1,7 +1,7 @@
require 'api/admin/enterprise_serializer'
module Api
class EnterpriseAttachmentController < BaseController
class EnterpriseAttachmentController < Api::BaseController
class MissingImplementationError < StandardError; end
class UnknownEnterpriseAuthorizationActionError < StandardError; end

2
app/controllers/api/enterprise_fees_controller.rb
View File

@@ -1,5 +1,5 @@
module Api
class EnterpriseFeesController < BaseController
class EnterpriseFeesController < Api::BaseController
respond_to :json
def destroy

2
app/controllers/api/logos_controller.rb
View File

@@ -1,5 +1,5 @@
module Api
class LogosController < EnterpriseAttachmentController
class LogosController < Api::EnterpriseAttachmentController
private
def attachment_name

2
app/controllers/api/order_cycles_controller.rb
View File

@@ -1,5 +1,5 @@
module Api
class OrderCyclesController < BaseController
class OrderCyclesController < Api::BaseController
include EnterprisesHelper
respond_to :json

2
app/controllers/api/orders_controller.rb
View File

@@ -1,5 +1,5 @@
module Api
class OrdersController < BaseController
class OrdersController < Api::BaseController
def show
authorize! :read, order
render json: order, serializer: Api::OrderDetailedSerializer, current_order: order

2
app/controllers/api/product_images_controller.rb
View File

@@ -1,5 +1,5 @@
module Api
class ProductImagesController < BaseController
class ProductImagesController < Api::BaseController
respond_to :json
def update_product_image

2
app/controllers/api/promo_images_controller.rb
View File

@@ -1,5 +1,5 @@
module Api
class PromoImagesController < EnterpriseAttachmentController
class PromoImagesController < Api::EnterpriseAttachmentController
private
def attachment_name