diff options
| author | Azul <azul@riseup.net> | 2016-08-18 11:00:16 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-08-19 11:15:31 +0200 |
| commit | fbad882075e745ab7afbe5f89c67544fb3c607c3 (patch) | |
| tree | d55e4c4dd3a6612e04e0fd40e736c8b6d4342762 /app/controllers/api | |
| parent | 20bb76848b852bba9ab3c99b1c2a68464585bd56 (diff) | |
respond_to on a per controller basis
If you inherit respond to and call it again in your controller
it will not overwrite the previous but add to it.
Since we always have some exceptions from the rules it's probably
easiest to be explicit in the controllers that require it themselves.
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/identities_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/services_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/sessions_controller.rb | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/api/identities_controller.rb b/app/controllers/api/identities_controller.rb index ab2ac00..de4910a 100644 --- a/app/controllers/api/identities_controller.rb +++ b/app/controllers/api/identities_controller.rb @@ -3,6 +3,8 @@ module Api before_filter :token_authenticate before_filter :require_monitor + respond_to :json + def show @identity = Identity.find_by_address(params[:id]) if @identity diff --git a/app/controllers/api/services_controller.rb b/app/controllers/api/services_controller.rb index da2774b..58e129c 100644 --- a/app/controllers/api/services_controller.rb +++ b/app/controllers/api/services_controller.rb @@ -2,6 +2,8 @@ class Api::ServicesController < ApiController before_filter :require_login, :unless => :anonymous_access_allowed? + respond_to :json + def show respond_with current_user.effective_service_level end diff --git a/app/controllers/api/sessions_controller.rb b/app/controllers/api/sessions_controller.rb index c8deb7a..178f86e 100644 --- a/app/controllers/api/sessions_controller.rb +++ b/app/controllers/api/sessions_controller.rb @@ -2,6 +2,7 @@ module Api class SessionsController < ApiController before_filter :require_login, only: :destroy + respond_to :json def new @session = Session.new |