diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 59a94438..4dd7f7af 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -47,18 +47,6 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController # @categories = @module_app.categories.enabled # end - - def search_result - if params[:search_query] == "" - redirect_to panel_announcement_front_end_search_result_path - else - @search = Bulletin.tire.search "#{params[:search_query]}" - search_result = @search.collect{|result| result.id} - - @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num) - redirect_to panel_announcement_front_end_search_result_path(params[:search_result]) - end - end def bulletins_list_and_pic diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_search_block.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_search_block.html.erb index 9a961849..538f340e 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_search_block.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_search_block.html.erb @@ -1,5 +1,5 @@

Search

-<%= form_tag panel_announcement_widget_search_result_path, method: :get do %> +<%= form_tag panel_announcement_front_end_search_result_path, method: :get do %> <%= hidden_field_tag :category_id, params[:category_id] %> <%= hidden_field_tag :tag_id, params[:tag_id] %>

diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index 15e8e628..708996e7 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -39,7 +39,6 @@ Rails.application.routes.draw do match "reload_web_links" => "bulletins#reload_web_links" match "bulletins_side_bar" => "bulletins#bulletins_side_bar" match "bulletins_search_block" => "bulletins#bulletins_search_block" - match "search_result" => "bulletins#search_result" end end end