From 87dd15b7bf8c8f00fb4eba7061eb511749df3131 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 4 May 2017 20:42:21 +0200 Subject: [PATCH] includes search concern in commendable actions --- app/controllers/concerns/commentable_actions.rb | 1 + app/controllers/debates_controller.rb | 1 - app/controllers/proposals_controller.rb | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb index 57d476b45..287f2d418 100644 --- a/app/controllers/concerns/commentable_actions.rb +++ b/app/controllers/concerns/commentable_actions.rb @@ -1,6 +1,7 @@ module CommentableActions extend ActiveSupport::Concern include Polymorphic + include Search def index @resources = @search_terms.present? ? resource_model.search(@search_terms) : resource_model.all diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 8becb6124..9b29080dd 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -2,7 +2,6 @@ class DebatesController < ApplicationController include FeatureFlags include CommentableActions include FlagActions - include Search before_action :parse_tag_filter, only: :index before_action :authenticate_user!, except: [:index, :show, :map] diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 1a2844136..d1707a8a7 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -1,7 +1,6 @@ class ProposalsController < ApplicationController include CommentableActions include FlagActions - include Search before_action :parse_tag_filter, only: :index before_action :load_categories, only: [:index, :new, :edit, :map, :summary]