diff options
| author | cedricnjanga | 2017-12-04 17:06:18 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-12-05 15:39:32 +0100 |
| commit | c3a56df2125a43178e701d7d149e18201f276cf0 (patch) | |
| tree | fd1b442efc275db8b1a11f245c2d1e0556a7072c /app/controllers/api | |
| parent | 03df723a37dc53ab73fc6539a85c9a0c892e7c99 (diff) | |
| download | chouette-core-c3a56df2125a43178e701d7d149e18201f276cf0.tar.bz2 | |
Small refacto to handle no_parent error for ComplianceCheckSet
Diffstat (limited to 'app/controllers/api')
3 files changed, 4 insertions, 7 deletions
diff --git a/app/controllers/api/v1/internals/application_controller.rb b/app/controllers/api/v1/internals/application_controller.rb index 2a9f2558a..77b74f5f6 100644 --- a/app/controllers/api/v1/internals/application_controller.rb +++ b/app/controllers/api/v1/internals/application_controller.rb @@ -2,16 +2,13 @@ module Api module V1 module Internals class ApplicationController < ActionController::Base - inherit_resources respond_to :json layout false before_action :authenticate private def authenticate - authenticate_with_http_token do |token, options| - @current_organisation = Api::V1::ApiKey.find_by_token(token).try(:organisation) - end + authenticate_with_http_token { |token| Rails.application.secrets.api_token == token } end end end diff --git a/app/controllers/api/v1/internals/compliance_check_sets_controller.rb b/app/controllers/api/v1/internals/compliance_check_sets_controller.rb index 5e9137cb5..db92c3fad 100644 --- a/app/controllers/api/v1/internals/compliance_check_sets_controller.rb +++ b/app/controllers/api/v1/internals/compliance_check_sets_controller.rb @@ -1,7 +1,7 @@ module Api module V1 module Internals - class ComplianceCheckSetsController < Api::V1::Internals::ApplicationController + class ComplianceCheckSetsController < ApplicationController include ControlFlow def validated @@ -19,7 +19,7 @@ module Api def notify_parent find_compliance_check_set - if @compliance_check_set.notify_parent + if @compliance_check_set.notify_parent && @compliance_check_set.parent render json: { status: "ok", message:"#{@compliance_check_set.parent_type} (id: #{@compliance_check_set.parent_id}) successfully notified at #{l(@compliance_check_set.notified_parent_at)}" diff --git a/app/controllers/api/v1/internals/netex_imports_controller.rb b/app/controllers/api/v1/internals/netex_imports_controller.rb index c8e33f7b8..89bc1b81d 100644 --- a/app/controllers/api/v1/internals/netex_imports_controller.rb +++ b/app/controllers/api/v1/internals/netex_imports_controller.rb @@ -1,7 +1,7 @@ module Api module V1 module Internals - class NetexImportsController < Api::V1::Internals::ApplicationController + class NetexImportsController < ApplicationController include ControlFlow def create |