leo
/
announcement-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update backend search

This commit is contained in:
manson 2014-08-07 18:45:21 +08:00
parent 2db32cd8b2
commit 26c78f46cc
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/admin/announcements_controller.rb
View File

@ -15,15 +15,13 @@ class Admin::AnnouncementsController < OrbitAdminController
@filter_fields = filter_fields(@categories, @tags) @filter_fields = filter_fields(@categories, @tags)
@table_fields = [:status, :category, :title, :start_date, :end_date, :last_modified] @table_fields = [:status, :category, :title, :start_date, :end_date, :last_modified]
@bulletins = Bulletin.where(:is_preview.in=>[false,nil]).order_by(sort).with_categories(filters("category")).with_tags(filters("tag")).with_status(filters("status")).page(params[:page]).per(10) @bulletins = Bulletin.where(:is_preview.in=>[false,nil])
.order_by(sort)
.with_categories(filters("category"))
.with_tags(filters("tag"))
.with_status(filters("status"))
if params[:keywords].present? @bulletins = search_data(@bulletins,[:title]).page(params[:page]).per(10)
key_string = params[:keywords]
key_string = key_string.strip.nil? ? key_string : key_string.strip
keywords = key_string.split(/\s+(?=(?:[^"]*"[^"]*")*[^"]*$)/)
regex = Regexp.union(keywords.map{|word| Regexp.new(".*"+word+".*", "i")})
@bulletins = @bulletins.any_of({:title=>regex}).page(params[:page]).per(10)
end
if request.xhr? if request.xhr?
render :partial => "index" render :partial => "index"

7
app/views/admin/announcements/index.html.erb
View File

@ -3,9 +3,4 @@
<%= render 'index'%> <%= render 'index'%>
</span> </span>
<%= render 'layouts/delete_modal', delete_options: @delete_options %> <%= render 'layouts/delete_modal', delete_options: @delete_options %>
<script type="text/javascript">
var filter = new Filter("#index_table");
bindPagination();
</script>