| @@ -18,11 +18,14 | |||
|
|
18 | 18 | class SearchController < ApplicationController |
|
|
19 | 19 | layout 'base' |
|
|
20 | 20 | |
|
|
21 | helper :messages | |
|
|
22 | include MessagesHelper | |
|
|
23 | ||
|
|
21 | 24 | def index |
|
|
22 | 25 | @question = params[:q] || "" |
|
|
23 | 26 | @question.strip! |
|
|
24 | 27 | @all_words = params[:all_words] || (params[:submit] ? false : true) |
|
|
25 | @scope = params[:scope] || (params[:submit] ? [] : %w(projects issues changesets news documents wiki) ) | |
|
|
28 | @scope = params[:scope] || (params[:submit] ? [] : %w(projects issues changesets news documents wiki messages) ) | |
|
|
26 | 29 | |
|
|
27 | 30 | # quick jump to an issue |
|
|
28 | 31 | if @scope.include?('issues') && @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(logged_in_user)) |
| @@ -52,6 +55,9 class SearchController < ApplicationController | |||
|
|
52 | 55 | @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' |
|
|
53 | 56 | @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') |
|
|
54 | 57 | @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') |
|
|
58 | Message.with_scope :find => {:conditions => ["#{Board.table_name}.project_id = ?", @project.id]} do | |
|
|
59 | @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' | |
|
|
60 | end | |
|
|
55 | 61 | else |
|
|
56 | 62 | Project.with_scope(:find => {:conditions => Project.visible_by(logged_in_user)}) do |
|
|
57 | 63 | @results += Project.find(:all, :limit => limit, :conditions => [ (["(LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'projects' |
| @@ -14,6 +14,9 | |||
|
|
14 | 14 | <% if @project.wiki %> |
|
|
15 | 15 | <%= check_box_tag 'scope[]', 'wiki', (@scope.include? 'wiki') %> <label><%= l(:label_wiki) %></label> |
|
|
16 | 16 | <% end %> |
|
|
17 | <% if @project.boards.any? %> | |
|
|
18 | <%= check_box_tag 'scope[]', 'messages', (@scope.include? 'messages') %> <label><%= l(:label_message_plural) %></label> | |
|
|
19 | <% end %> | |
|
|
17 | 20 | <% else %> |
|
|
18 | 21 | <%= check_box_tag 'scope[]', 'projects', (@scope.include? 'projects') %> <label><%= l(:label_project_plural) %></label> |
|
|
19 | 22 | <% end %> |
| @@ -51,6 +54,10 | |||
|
|
51 | 54 | <%=l(:label_revision)%> <%= link_to h(e.revision), :controller => 'repositories', :action => 'revision', :id => @project, :rev => e.revision %><br /> |
|
|
52 | 55 | <%= highlight_tokens(e.comments, @tokens) %><br /> |
|
|
53 | 56 | <em><%= e.committer.blank? ? e.committer : "Anonymous" %>, <%= format_time(e.committed_on) %></em> |
|
|
57 | <% elsif e.is_a? Message %> | |
|
|
58 | <%=h e.board.name %>: <%= link_to_message e %><br /> | |
|
|
59 | <%= highlight_tokens(e.content, @tokens) %><br /> | |
|
|
60 | <em><%= e.author ? e.author.name : "Anonymous" %>, <%= format_time(e.created_on) %></em> | |
|
|
54 | 61 | <% end %> |
|
|
55 | 62 | </p></li> |
|
|
56 | 63 | <% end %> |
General Comments 0
You need to be logged in to leave comments.
Login now