jro_apps/redmine Commit - r747:42fe6c6e0456

Search engine now only searches objects the user is allowed to view....

Jean-Philippe Lang -

r747:42fe6c6e0456

parent child

Context file:

r747:42fe6c6e0456

Collapse all files

app/controllers/search_controller.rb +17 -4

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class SearchController < ApplicationController
               layout 'base'
               helper :messages
               include MessagesHelper
               def index
                 @question = params[:q] || ""
                 @question.strip!
                 @all_words = params[:all_words] || (params[:submit] ? false : true)
-                @scope = params[:scope] || (params[:submit] ? [] : %w(projects issues changesets news documents wiki messages) )
                 # quick jump to an issue
-                if @scope.include?('issues') && @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(logged_in_user))
+                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
                   return
                 end
                 if params[:id]
                   find_project
                   return unless check_project_privacy
                 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 = @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
+                  @scope = %w(projects)
+                end
                 # tokens must be at least 3 character long
                 @tokens = @question.split.uniq.select {|w| w.length > 2 }
                 if !@tokens.empty?
                   # no more than 5 tokens to search for
                   @tokens.slice! 5..-1 if @tokens.size > 5
                   # strings used in sql like statement
                   like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}
                   operator = @all_words ? " AND " : " OR "
                   limit = 10
                   @results = []
                   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'
                     Journal.with_scope :find => {:conditions => ["#{Issue.table_name}.project_id = ?", @project.id]} do
                       @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'
                     end
                     @results.uniq!
                     @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'
                     @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'
-                    @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')
+                    @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')
                     @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')
                     Message.with_scope :find => {:conditions => ["#{Board.table_name}.project_id = ?", @project.id]} do
                       @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
                     Project.with_scope(:find => {:conditions => Project.visible_by(logged_in_user)}) do
                       @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'
                     end
                     # if only one project is found, user is redirected to its overview
                     redirect_to :controller => 'projects', :action => 'show', :id => @results.first and return if @results.size == 1
                   end
                   @question = @tokens.join(" ")
                 else
                   @question = ""
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/search/index.rhtml +2 -15

             <h2><%= l(:label_search) %></h2>
             <div class="box">
             <% form_tag({}, :method => :get) do %>
             <p><%= text_field_tag 'q', @question, :size => 30, :id => 'search-input' %>
             <%= javascript_tag "Field.focus('search-input')" %>
-            <% if @project %>
+            <% @object_types.each do |t| %>
-              <%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>
+            <label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>
-              <% if @project.repository %>
-              <%= check_box_tag 'scope[]', 'changesets', (@scope.include? 'changesets') %> <label><%= l(:label_revision_plural) %></label>
-              <% end %>
-              <%= check_box_tag 'scope[]', 'news', (@scope.include? 'news') %> <label><%= l(:label_news_plural) %></label>
-              <%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label>
-              <% if @project.wiki %>
-              <%= check_box_tag 'scope[]', 'wiki', (@scope.include? 'wiki') %> <label><%= l(:label_wiki) %></label>
-              <% end %>
-              <% if @project.boards.any? %>
-              <%= check_box_tag 'scope[]', 'messages', (@scope.include? 'messages') %> <label><%= l(:label_message_plural) %></label>
-              <% end %>
-            <% else %>
-              <%= check_box_tag 'scope[]', 'projects', (@scope.include? 'projects') %> <label><%= l(:label_project_plural) %></label>
             <% end %>
             <br />
             <%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>
             <%= submit_tag l(:button_submit), :name => 'submit' %>
             <% end %>
             </div>
             <% if @results %>
                 <h3><%= lwr(:label_result, @results.length) %></h3>
                 <ul>
                   <% @results.each do |e| %>
                     <li><p>
                     <% if e.is_a? Project %>
                         <%= link_to highlight_tokens(h(e.name), @tokens), :controller => 'projects', :action => 'show', :id => e %><br />
                         <%= highlight_tokens(e.description, @tokens) %>
                     <% elsif e.is_a? Issue %>
                         <%= link_to_issue e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />
                         <%= highlight_tokens(e.description, @tokens) %><br />
                         <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
                     <% elsif e.is_a? News %>
                         <%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />
                         <%= highlight_tokens(e.description, @tokens) %><br />
                         <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
                     <% elsif e.is_a? Document %>
                         <%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />
                         <%= highlight_tokens(e.description, @tokens) %><br />
                         <i><%= format_time(e.created_on) %></i>
                     <% elsif e.is_a? WikiPage %>
                         <%=l(:label_wiki)%>: <%= link_to highlight_tokens(h(e.pretty_title), @tokens), :controller => 'wiki', :action => 'index', :id => @project, :page => e.title %><br />
                         <%= highlight_tokens(e.content.text, @tokens) %><br />
                         <i><%= e.content.author ? e.content.author.name : "Anonymous" %>, <%= format_time(e.content.updated_on) %></i>
                     <% elsif e.is_a? Changeset %>
                         <%=l(:label_revision)%> <%= link_to h(e.revision), :controller => 'repositories', :action => 'revision', :id => @project, :rev => e.revision %><br />
                         <%= highlight_tokens(e.comments, @tokens) %><br />
                         <em><%= e.committer.blank? ? e.committer : "Anonymous" %>, <%= format_time(e.committed_on) %></em>
                     <% elsif e.is_a? Message %>
                         <%=h e.board.name %>: <%= link_to_message e %><br />
                         <%= highlight_tokens(e.content, @tokens) %><br />
                         <em><%= e.author ? e.author.name : "Anonymous" %>, <%= format_time(e.created_on) %></em>
                     <% end %>
                     </p></li>
                   <% end %>
                 </ul>
             <% 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