From 728ba622b7ea9e96ed5d5965f3b19c6ef63b9d80 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Mon, 23 Dec 2013 10:07:58 +0800 Subject: [PATCH] Frontend for Search working --- .../announcement/front_end/bulletins_controller.rb | 13 ------------- .../front_end/bulletins/search_result.html.erb | 1 - .../built_in_modules/announcement/config/routes.rb | 1 - 3 files changed, 15 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index b7c9766b..d2fee708 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -9,19 +9,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController end def search_result - debug - if params[:search_query] == "" - @bulletins = get_bulletins_for_index - 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) - end - end - - - def search if params[:search_query] == "" @bulletins = get_bulletins_for_index else diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/search_result.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/search_result.html.erb index 3979362b..df681869 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/search_result.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/search_result.html.erb @@ -1,4 +1,3 @@ -

Test

<% # encoding: utf-8 %> <%= flash_messages %>

<%= @page.title rescue nil %>

diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index 75692e8b..021cc89b 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -28,7 +28,6 @@ Rails.application.routes.draw do namespace :front_end do match "index_by_unit" => "bulletins#index_bulletins_by_unit",:as => :index_bulletins_by_unit match "search_result" => "bulletins#search_result" - match "search" => "bulletins#search" resources :bulletins # do # match "preview" => "bulletins#preview_content",:as => :get_preview_content