From 8198c815bacddd11383f45aab337aacce30a206a Mon Sep 17 00:00:00 2001 From: Bardoe Besselaar Date: Fri, 19 May 2017 10:09:15 +1200 Subject: [PATCH] #29 - Event API search fix for type_id column o Rename detailed search attribute id to type_id so the correct field name is used o Rename 'type' event parameter to 'type_id' so the field is accepted by the controller --- .../javascripts/controllers/detailed_search_controller.coffee | 4 ++-- app/controllers/api/v1/events_controller.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/controllers/detailed_search_controller.coffee b/app/assets/javascripts/controllers/detailed_search_controller.coffee index 63bbc5f..0d31d80 100644 --- a/app/assets/javascripts/controllers/detailed_search_controller.coffee +++ b/app/assets/javascripts/controllers/detailed_search_controller.coffee @@ -116,7 +116,7 @@ EventKit.DetailedSearchController = Em.ArrayController.extend({ } { name: "Type" - id: "type" + id: "type_id" } { name: "URL" @@ -127,4 +127,4 @@ EventKit.DetailedSearchController = Em.ArrayController.extend({ id: "useragent" }] -}) \ No newline at end of file +}) diff --git a/app/controllers/api/v1/events_controller.rb b/app/controllers/api/v1/events_controller.rb index 3998380..1f71a1e 100644 --- a/app/controllers/api/v1/events_controller.rb +++ b/app/controllers/api/v1/events_controller.rb @@ -201,7 +201,7 @@ def destroy private def event_params(params) - params.require(:event).permit(:timestamp, :event, :email, :"smtp-id", :sg_event_id, :sg_message_id, :category, :newsletter, :response, :reason, :ip, :useragent, :attempt, :status, :type, :url, :additional_arguments, :event_post_timestamp, :raw, :asm_group_id) + params.require(:event).permit(:timestamp, :event, :email, :"smtp-id", :sg_event_id, :sg_message_id, :category, :newsletter, :response, :reason, :ip, :useragent, :attempt, :status, :type_id, :url, :additional_arguments, :event_post_timestamp, :raw, :asm_group_id) end end