Merge branch 'api_fixes' into bom

2026-03-18 04:39:14 +00:00 · 2014-04-23 12:03:01 +10:00
parent 2532248e6f 669ec0eee7
commit b37a701d39
62 changed files with 775 additions and 2282 deletions
--- a/app/controllers/api/enterprises_controller.rb
+++ b/app/controllers/api/enterprises_controller.rb
@@ -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