jro_apps/redmine Commit - r755:a96421019f3a

Search engines now supports pagination....

Jean-Philippe Lang -

r755:a96421019f3a

parent child

Context file:

r755:a96421019f3a

Expand all files

lib/plugins/acts_as_searchable/init.rb created 644 +2 0

@@ -0,0 +1,2
	1	require File.dirname(__FILE__) + '/lib/acts_as_searchable'
	2	ActiveRecord::Base.send(:include, Redmine::Acts::Searchable)

lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb created 644 +89 0

@@ -0,0 +1,89
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	module Acts
	20	module Searchable
	21	def self.included(base)
	22	base.extend ClassMethods
	23	end
	24
	25	module ClassMethods
	26	def acts_as_searchable(options = {})
	27	return if self.included_modules.include?(Redmine::Acts::Searchable::InstanceMethods)
	28
	29	cattr_accessor :searchable_options
	30	self.searchable_options = options
	31
	32	if searchable_options[:columns].nil?
	33	raise 'No searchable column defined.'
	34	elsif !searchable_options[:columns].is_a?(Array)
	35	searchable_options[:columns] = [] << searchable_options[:columns]
	36	end
	37
	38	if searchable_options[:project_key]
	39	elsif column_names.include?('project_id')
	40	searchable_options[:project_key] = "#{table_name}.project_id"
	41	else
	42	raise 'No project key defined.'
	43	end
	44
	45	if searchable_options[:date_column]
	46	elsif column_names.include?('created_on')
	47	searchable_options[:date_column] = "#{table_name}.created_on"
	48	else
	49	raise 'No date column defined defined.'
	50	end
	51
	52	send :include, Redmine::Acts::Searchable::InstanceMethods
	53	end
	54	end
	55
	56	module InstanceMethods
	57	def self.included(base)
	58	base.extend ClassMethods
	59	end
	60
	61	module ClassMethods
	62	def search(tokens, all_tokens, project, options={})
	63	tokens = [] << tokens unless tokens.is_a?(Array)
	64	find_options = {:include => searchable_options[:include]}
	65	find_options[:limit] = options[:limit] if options[:limit]
	66	find_options[:order] = "#{searchable_options[:date_column]} " + (options[:before] ? 'DESC' : 'ASC')
	67
	68	sql = ([ '(' + searchable_options[:columns].collect {\|column\| "(LOWER(#{column}) LIKE ?)"}.join(' OR ') + ')' ] * tokens.size).join(all_tokens ? ' AND ' : ' OR ')
	69	if options[:offset]
	70	sql = "(#{sql}) AND (#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"
	71	end
	72	find_options[:conditions] = [sql, * (tokens * searchable_options[:columns].size).sort]
	73
	74	results = with_scope(:find => {:conditions => ["#{searchable_options[:project_key]} = ?", project.id]}) do
	75	find(:all, find_options)
	76	end
	77	if searchable_options[:with]
	78	searchable_options[:with].each do \|model, assoc\|
	79	results += model.to_s.camelcase.constantize.search(tokens, all_tokens, project, options).collect {\|r\| r.send assoc}
	80	end
	81	results.uniq!
	82	end
	83	results
	84	end
	85	end
	86	end
	87	end
	88	end
	89	end

app/controllers/search_controller.rb +22 -15

                 @question.strip!
                 @all_words = params[:all_words] || (params[:submit] ? false : true)
+                offset = nil
+                begin; offset = params[:offset].to_time if params[:offset]; rescue; end
                 # quick jump to an issue
                 if @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(logged_in_user))
                   redirect_to :controller => "issues", :action => "show", :id => $1
                 end
                 if @project
-                  @object_types = %w(projects issues changesets news documents wiki_pages messages)
-                  @object_types.delete('wiki_pages') unless @project.wiki
-                  @object_types.delete('changesets') unless @project.repository
                   # only show what the user is allowed to view
+                  @object_types = %w(issues news documents changesets wiki_pages messages)
                   @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
                   @scope = @object_types.select {|t| params[t]}
-                  # default objects to search if none is specified in parameters
                   @scope = @object_types if @scope.empty?
                 else
                   @object_types = @scope = %w(projects)
                   # strings used in sql like statement
                   like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}
                   operator = @all_words ? " AND " : " OR "
-                  limit = 10
                   @results = []
+                  limit = 10
                   if @project
-                    @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(subject) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'
+                    @scope.each do |s|
-                    Journal.with_scope :find => {:conditions => ["#{Issue.table_name}.project_id = ?", @project.id]} do
+                      @results += s.singularize.camelcase.constantize.search(like_tokens, @all_words, @project,
-                      @results += Journal.find(:all, :include => :issue, :limit => limit, :conditions => [ (["(LOWER(notes) like ? OR LOWER(notes) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ).collect(&:issue) if @scope.include? 'issues'
+                      :limit => (limit+1), :offset => offset, :before => params[:previous].nil?)
                     end
-                    @results.uniq!
+                    @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
-                    @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'
+                    if params[:previous].nil?
-                    @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'
+                      @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
-                    @results += @project.wiki.pages.find(:all, :limit => limit, :include => :content, :conditions => [ (["(LOWER(title) like ? OR LOWER(text) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @project.wiki && @scope.include?('wiki_pages')
+                      if @results.size > limit
-                    @results += @project.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comments) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
+                        @pagination_next_date = @results[limit-1].event_datetime
-                    Message.with_scope :find => {:conditions => ["#{Board.table_name}.project_id = ?", @project.id]} do
+                        @results = @results[0, limit]
-                      @results += Message.find(:all, :include => :board, :limit => limit, :conditions => [ (["(LOWER(subject) like ? OR LOWER(content) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'messages'
+                      end
+                    else
+                      @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
+                      if @results.size > limit
+                        @pagination_previous_date = @results[-(limit)].event_datetime
+                        @results = @results[-(limit), limit]
+                      end
                     end
                   else
                     Project.with_scope(:find => {:conditions => Project.visible_by(logged_in_user)}) do
                 else
                   @question = ""
                 end
+                render :layout => false if request.xhr?
               end
             private

app/helpers/search_helper.rb +1 -1

             module SearchHelper
               def highlight_tokens(text, tokens)
-                return text unless tokens && !tokens.empty?
+                return text unless text && tokens && !tokens.empty?
                 regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE
                 result = ''
                 text.split(regexp).each_with_index do |words, i|

app/models/changeset.rb +5 0

                             :datetime => :committed_on,
                             :author => :committer,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
+              acts_as_searchable :columns => 'comments',
+                                 :include => :repository,
+                                 :project_key => "#{Repository.table_name}.project_id",
+                                 :date_column => 'committed_on'
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_numericality_of :revision, :only_integer => true

app/models/document.rb +3 -1

               belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
               has_many :attachments, :as => :container, :dependent => :destroy
-              acts_as_event :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
+              acts_as_searchable :columns => ['title', 'description']
+              acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
+                            :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
               validates_presence_of :project, :title, :category
               validates_length_of :title, :maximum => 60

app/models/issue.rb +2 -1

               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_watchable
+              acts_as_searchable :columns => ['subject', 'description'], :with => {:journal => :issue}
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}
               validates_presence_of :subject, :description, :priority, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255

app/models/journal.rb +5 0

               belongs_to :user
               has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
+              acts_as_searchable :columns => 'notes',
+                                 :include => :issue,
+                                 :project_key => "#{Issue.table_name}.project_id",
+                                 :date_column => "#{Issue.table_name}.created_on"
             end

app/models/message.rb +5 0

               has_many :attachments, :as => :container, :dependent => :destroy
               belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
+              acts_as_searchable :columns => ['subject', 'content'], :include => :board, :project_key => "project_id"
+              acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
+                            :description => :content,
+                            :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id, :id => o.id}}
               validates_presence_of :subject, :content
               validates_length_of :subject, :maximum => 255

app/models/news.rb +1 0

               validates_length_of :title, :maximum => 60
               validates_length_of :summary, :maximum => 255
+              acts_as_searchable :columns => ['title', 'description']
               acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
               # returns latest news for projects visible by user

app/models/project.rb +5 -1

               has_one :wiki, :dependent => :destroy
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
               acts_as_tree :order => "name", :counter_cache => true
+              acts_as_searchable :columns => ['name', 'description'], :project_key => 'id'
+              acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
+                            :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}}
               attr_protected :status, :enabled_module_names
               validates_presence_of :name, :description, :identifier

app/models/wiki_page.rb +14 -1

               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               has_many :attachments, :as => :container, :dependent => :destroy
+              acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
+                            :description => :text,
+                            :datetime => :created_on,
+                            :url => Proc.new {|o| {:controller => 'wiki', :id => o.wiki.project_id, :page => o.title}}
+              acts_as_searchable :columns => ['title', 'text'],
+                                 :include => [:wiki, :content],
+                                 :project_key => "#{Wiki.table_name}.project_id"
               attr_accessor :redirect_existing_links
               validates_presence_of :title
               def project
                 wiki.project
               end
+              def text
+                content.text if content
+              end
             end
             class WikiDiff

app/views/search/index.rhtml +19 -31

@@ -15,39 +15,27
15	</div>	15	</div>
16		16
17	<% if @results %>	17	<% if @results %>
18	<h3><%= lwr(:label_result, ~~@results~~.~~length~~) %></h3>	18	<h3><%= l(:label_result_plural) %></h3>
19	<ul>	19	<ul>
20	<% @results.each do \|e\| %>	20	<% @results.each do \|e\| %>
21	<li><p>	21	<li><p><%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %><br />
22	<% if e.is_a? Project %>	22	<%= highlight_tokens(e.event_description, @tokens) %><br />
23	<%= link_to highlight_tokens(h(e.name), @tokens), :controller => 'projects', :action => 'show', :id => e %><br />	23	<span class="author"><%= format_time(e.event_datetime) %></span></p></li>
24	<%= highlight_tokens(e.description, @tokens) %>
25	<% elsif e.is_a? Issue %>
26	<%= link_to_issue e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />
27	<%= highlight_tokens(e.description, @tokens) %><br />
28	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
29	<% elsif e.is_a? News %>
30	<%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />
31	<%= highlight_tokens(e.description, @tokens) %><br />
32	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
33	<% elsif e.is_a? Document %>
34	<%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />
35	<%= highlight_tokens(e.description, @tokens) %><br />
36	<i><%= format_time(e.created_on) %></i>
37	<% elsif e.is_a? WikiPage %>
38	<%=l(:label_wiki)%>: <%= link_to highlight_tokens(h(e.pretty_title), @tokens), :controller => 'wiki', :action => 'index', :id => @project, :page => e.title %><br />
39	<%= highlight_tokens(e.content.text, @tokens) %><br />
40	<i><%= e.content.author ? e.content.author.name : "Anonymous" %>, <%= format_time(e.content.updated_on) %></i>
41	<% elsif e.is_a? Changeset %>
42	<%=l(:label_revision)%> <%= link_to h(e.revision), :controller => 'repositories', :action => 'revision', :id => @project, :rev => e.revision %><br />
43	<%= highlight_tokens(e.comments, @tokens) %><br />
44	<em><%= e.committer.blank? ? e.committer : "Anonymous" %>, <%= format_time(e.committed_on) %></em>
45	<% elsif e.is_a? Message %>
46	<%=h e.board.name %>: <%= link_to_message e %><br />
47	<%= highlight_tokens(e.content, @tokens) %><br />
48	<em><%= e.author ? e.author.name : "Anonymous" %>, <%= format_time(e.created_on) %></em>
49	<% end %>
50	</p></li>
51	<% end %>	24	<% end %>
52	</ul>	25	</ul>
53	<% end %>	26	<% end %>
		27
		28	<p><center>
		29	<% if @pagination_previous_date %>
		30	<%= link_to_remote ('« ' + l(:label_previous)),
		31	{:update => :content,
		32	:url => params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))
		33	}, :href => url_for(params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %>
		34	<% end %>
		35	<% if @pagination_next_date %>
		36	<%= link_to_remote (l(:label_next) + ' »'),
		37	{:update => :content,
		38	:url => params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))
		39	}, :href => url_for(params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
		40	<% end %>
		41	</center></p>

config/environment.rb +2 0

               # Add additional load paths for sweepers
               config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )
+              config.plugin_paths = ['lib/plugins', 'vendor/plugins']
               # Force all environments to use the same logger level
               # (by default production uses :info, the others :debug)

lang/en.yml +1 -2

             label_roadmap_overdue: %s late
             label_roadmap_no_issues: No issues for this version
             label_search: Search
-            label_result: %d result
+            label_result_plural: Results
-            label_result_plural: %d results
             label_all_words: All words
             label_wiki: Wiki
             label_wiki_edit: Wiki edit

lang/fr.yml +1 -2

             label_roadmap_overdue: En retard de %s
             label_roadmap_no_issues: Aucune demande pour cette version
             label_search: Recherche
-            label_result: %d résultat
+            label_result_plural: Résultats
-            label_result_plural: %d résultats
             label_all_words: Tous les mots
             label_wiki: Wiki
             label_wiki_edit: Révision wiki

lib/plugins/acts_as_event/init.rb ~~lib/redmine/acts_as_event/init.rb~~ renamed 0 0

NO CONTENT: file renamed from lib/redmine/acts_as_event/init.rb to lib/plugins/acts_as_event/init.rb

lib/plugins/acts_as_event/lib/acts_as_event.rb ~~lib/redmine/acts_as_event/lib/acts_as_event.rb~~ renamed 0 0

NO CONTENT: file renamed from lib/redmine/acts_as_event/lib/acts_as_event.rb to lib/plugins/acts_as_event/lib/acts_as_event.rb

lib/plugins/acts_as_watchable/init.rb ~~lib/redmine/acts_as_watchable/init.rb~~ renamed 0 0

NO CONTENT: file renamed from lib/redmine/acts_as_watchable/init.rb to lib/plugins/acts_as_watchable/init.rb

lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb ~~lib/redmine/acts_as_watchable/lib/acts_as_watchable.rb~~ renamed 0 0

NO CONTENT: file renamed from lib/redmine/acts_as_watchable/lib/acts_as_watchable.rb to lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb

lib/redmine.rb 0 -2

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/mime_type'
-            require 'redmine/acts_as_watchable/init'
-            require 'redmine/acts_as_event/init'
             require 'redmine/plugin'
             begin

test/functional/search_controller_test.rb +1 -1

                 assert_template 'index'
                 assert_not_nil assigns(:project)
-                get :index, :id => 1, :q => "can", :scope => ["issues", "news", "documents"]
+                get :index, :id => 1, :q => "can"
                 assert_response :success
                 assert_template 'index'
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages