From ead11444cd59077401614558eb68a6d2205cb303 Mon Sep 17 00:00:00 2001 From: Martin Fenner Date: Sun, 9 Jun 2019 08:29:57 +0200 Subject: [PATCH] show events by doi. #290 --- app/controllers/events_controller.rb | 2 +- config/routes.rb | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index f9f7ea533..ccc151c5e 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -85,7 +85,7 @@ def index response = Event.query(params[:query], subj_id: params[:subj_id], obj_id: params[:obj_id], - doi: params[:doi], + doi: params[:doi_id] || params[:doi], orcid: params[:orcid], prefix: params[:prefix], subtype: params[:subtype], diff --git a/config/routes.rb b/config/routes.rb index 34d2ef81c..ccad96033 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -55,22 +55,19 @@ resources :activities, only: [:index, :show] - resources :clients, constraints: { :id => /.+/ } do - resources :prefixes, constraints: { :id => /.+/ } - resources :dois, constraints: { :id => /.+/ } + resources :clients, constraints: { id: /.+/ } do + resources :prefixes, constraints: { id: /.+/ } + resources :dois, constraints: { id: /.+/ } end - resources :client_prefixes, path: 'client-prefixes' - resources :dois, constraints: { :id => /.+/ } do + resources :client_prefixes, path: "client-prefixes" + resources :dois, constraints: { id: /.+/ } do resources :metadata resources :media resources :activities + resources :events end - # scope module: :v2 do - # resources :events - # end - constraints(-> (req) { req.env["HTTP_ACCEPT"].to_s.include?("version=2") }) do resources :events end