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

Merge branch 'api_fixes' into bom

Browse Source
This commit is contained in:
Rob H
2014-04-23 12:03:01 +10:00
parent 2532248e6f 669ec0eee7
commit b37a701d39
62 changed files with 775 additions and 2282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/enterprises_controller.rb
View File

@@ -4,7 +4,7 @@ module Api
def managed
@enterprises = Enterprise.ransack(params[:q]).result.managed_by(current_api_user)
respond_with(@enterprises)
render params[:template] || :bulk_index
end
def accessible
@@ -12,4 +12,4 @@ module Api
respond_with(@enterprises)
end
end
end
end

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

@@ -3,7 +3,7 @@ module Api
respond_to :json
def managed
@order_cycles = OrderCycle.ransack(params[:q]).result.managed_by(current_api_user)
render :bulk_index
render params[:template] || :bulk_index
end
def accessible