jro_apps/redmine Commit - r282:83c96d4f3ef2

search engine improvements and simple test...

Jean-Philippe Lang -

r282:83c96d4f3ef2

parent child

Context file:

r282:83c96d4f3ef2

Collapse all files

app/controllers/projects_controller.rb +5 -3

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'csv'
             class ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # Lists public projects
               def list
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count(:all, :conditions => ["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
                   @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if params[:repository_enabled] && params[:repository_enabled] == "1"
                     @project.repository = Repository.new
                     @project.repository.attributes = params[:repository]
                   end
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @members = @project.members.find(:all, :include => [:user, :role])
                 @subprojects = @project.children if @project.children.size > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
                 @trackers = Tracker.find(:all, :order => 'position')
                 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN issue_statuses ON issue_statuses.id = issues.status_id", :conditions => ["project_id=? and issue_statuses.is_closed=?", @project.id, false])
                 @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
               end
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField.find(:all)
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find(:all, :order => 'position')
                 @users = User.find_active(:all) - @project.users
                 @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if params[:repository_enabled]
                     case params[:repository_enabled]
                     when "0"
                       @project.repository = nil
                     when "1"
                       @project.repository ||= Repository.new
                       @project.repository.update_attributes params[:repository]
                     end
                   end
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Delete @project
               def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
               end
               # Add a new issue category to @project
               def add_issue_category
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :tab => 'categories', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :tab => 'members', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members.find(:all)
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
                   # Save the attachments
                   params[:attachments].each { |a|
                     Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   flash[:notice] = l(:notice_successful_create)
                   Mailer.deliver_document_add(@document) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :action => 'list_documents', :id => @project
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents.find :all, :include => :category
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 if request.get?
                   @issue.start_date = Date.today
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Multiple file upload
                   @attachments = []
                   params[:attachments].each { |a|
                     @attachments << Attachment.new(:container => @issue, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
                     @attachments.each(&:save)
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 @results_per_page_options = [ 15, 25, 50, 100 ]
                 if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
                   @results_per_page = params[:per_page].to_i
                   session[:results_per_page] = @results_per_page
                 else
                   @results_per_page = session[:results_per_page] || 25
                 end
                 if @query.valid?
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
               						:include => [ :author, :status, :tracker, :project, :priority ],
               						:conditions => @query.statement,
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset
                 end
                 @trackers = Tracker.find :all, :order => 'position'
                 render :layout => false if request.xhr?
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                 ic = Iconv.new('ISO-8859-1', 'UTF-8')
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [ "#", l(:field_status),
                                    l(:field_tracker),
                                    l(:field_priority),
                                    l(:field_subject),
                                    l(:field_author),
                                    l(:field_start_date),
                                    l(:field_due_date),
                                    l(:field_done_ratio),
                                    l(:field_created_on),
                                    l(:field_updated_on)
                                    ]
                   for custom_field in @project.all_custom_fields
                     headers << custom_field.name
                   end
                   csv << headers.collect {|c| ic.iconv(c) }
                   # csv lines
                   @issues.each do |issue|
                     fields = [issue.id, issue.status.name,
                                         issue.tracker.name,
                                         issue.priority.name,
                                         issue.subject,
                                         issue.author.display_name,
                                         issue.start_date ? l_date(issue.start_date) : nil,
                                         issue.due_date ? l_date(issue.due_date) : nil,
                                         issue.done_ratio,
                                         l_datetime(issue.created_on),
                                         l_datetime(issue.updated_on)
                                         ]
                     for custom_field in @project.all_custom_fields
                       fields << (show_value issue.custom_value_for(custom_field))
                     end
                     csv << fields.collect {|c| ic.iconv(c.to_s) }
                   end
                 end
                 export.rewind
                 send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
               end
               # Export filtered/sorted issues to PDF
               def export_issues_pdf
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :priority ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "export.pdf"
                 render :layout => false
               end
               def move_issues
                 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
                 redirect_to :action => 'list_issues', :id => @project and return unless @issues
                 @projects = []
                 # find projects to which the user is allowed to move the issue
                 @logged_in_user.memberships.each {|m| @projects << m.project if Permission.allowed_to_role("projects/move_issues", m.role_id)}
                 # issue can be moved to any tracker
                 @trackers = Tracker.find(:all)
                 if request.post? and params[:new_project_id] and params[:new_tracker_id]
                   new_project = Project.find(params[:new_project_id])
                   new_tracker = Tracker.find(params[:new_tracker_id])
                   @issues.each { |i|
                     # project dependent properties
                     unless i.project_id == new_project.id
                       i.category = nil
                       i.fixed_version = nil
                     end
                     # move the issue
                     i.project = new_project
                     i.tracker = new_tracker
                     i.save
                   }
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list_issues', :id => @project
                 end
               end
               def add_query
                 @query = Query.new(params[:query])
                 @query.project = @project
                 @query.user = logged_in_user
                 params[:fields].each do |field|
                   @query.add_filter(field, params[:operators][field], params[:values][field])
                 end if params[:fields]
                 if request.post? and @query.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
                 end
                 render :layout => false if request.xhr?
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
                 render :action => "list_news", :layout => false if request.xhr?
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   # Save the attachments
                   @attachments = []
                   params[:attachments].each { |file|
                     next unless file.size > 0
                     a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
                     @attachments << a unless a.new_record?
                   } if params[:attachments] and params[:attachments].is_a? Array
                   Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog for @project
               def changelog
                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else
                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
                 end
                 @selected_tracker_ids ||= []
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "issue_statuses.is_closed=? and issues.tracker_id in (#{@selected_tracker_ids.join(',')}) and issues.fixed_version_id is not null", true],
                   :order => "versions.effective_date DESC, issues.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
               def roadmap
                 @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else
                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
                 end
                 @selected_tracker_ids ||= []
                 @versions = @project.versions.find(:all,
                   :conditions => [ "versions.effective_date>?", Date.today],
                   :order => "versions.effective_date ASC"
                 )
               end
               def activity
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 @events_by_day = {}
                 unless params[:show_issues] == "0"
                   @project.issues.find(:all, :include => [:author, :status], :conditions => ["issues.created_on>=? and issues.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_issues = 1
                 end
                 unless params[:show_news] == "0"
                   @project.news.find(:all, :conditions => ["news.created_on>=? and news.created_on<=?", @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_news = 1
                 end
                 unless params[:show_files] == "0"
                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN versions ON versions.id = attachments.container_id", :conditions => ["attachments.container_type='Version' and versions.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_files = 1
                 end
                 unless params[:show_documents] == "0"
                   @project.documents.find(:all, :conditions => ["documents.created_on>=? and documents.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_documents = 1
                 end
                 render :layout => false if request.xhr?
               end
               def calendar
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 # start on monday
                 @date_from = @date_from - (@date_from.cwday-1)
                 # finish on sunday
                 @date_to = @date_to + (7-@date_to.cwday)
                 @issues = @project.issues.find(:all, :include => [:tracker, :status, :assigned_to, :priority], :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to])
                 render :layout => false if request.xhr?
               end
               def gantt
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= (Date.today << 1).month
                   @year_from ||= (Date.today << 1).year
                 end
                 @zoom = (params[:zoom].to_i > 0 and params[:zoom].to_i < 5) ? params[:zoom].to_i : 2
                 @months = (params[:months].to_i > 0 and params[:months].to_i < 25) ? params[:months].to_i : 6
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
                 @issues = @project.issues.find(:all, :order => "start_date, due_date", :include => [:tracker, :status, :assigned_to, :priority], :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to])
                 if params[:output]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 else
                   render :template => "projects/gantt.rhtml"
                 end
               end
               def search
                 @token = params[:token]
                 @scope = params[:scope] || (params[:submit] ? [] : %w(issues news documents) )
                 if @token and @token.length > 2
+                  @token.strip!
+                  like_token = "%#{@token}%"
                   @results = []
-                  @results += @project.issues.find(:all, :include => :author, :conditions => ["issues.subject like ?", "%#{@token}%"] ) if @scope.include? 'issues'
+                  @results += @project.issues.find(:all, :include => :author, :conditions => ["issues.subject like ? or issues.description like ?", like_token, like_token] ) if @scope.include? 'issues'
-                  @results += @project.news.find(:all, :conditions => ["news.title like ?", "%#{@token}%"], :include => :author ) if @scope.include? 'news'
+                  @results += @project.news.find(:all, :conditions => ["news.title like ? or news.description like ?", like_token, like_token], :include => :author ) if @scope.include? 'news'
-                  @results += @project.documents.find(:all, :conditions => ["title like ?", "%#{@token}%"] ) if @scope.include? 'documents'
+                  @results += @project.documents.find(:all, :conditions => ["title like ? or description like ?", like_token, like_token] ) if @scope.include? 'documents'
                 end
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
                 @html_title = @project.name
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if params[:query_id]
                   @query = @project.queries.find(params[:query_id])
                   session[:query] = @query
                 else
                   if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_")
                     @query.project = @project
                     if params[:fields] and params[:fields].is_a? Array
                       params[:fields].each do |field|
                         @query.add_filter(field, params[:operators][field], params[:values][field])
                       end
                     else
                       @query.available_filters.keys.each do |field|
                         @query.add_short_filter(field, params[field]) if params[field]
                       end
                     end
                     session[:query] = @query
                   else
                     @query = session[:query]
                   end
                 end
               end
             end

app/helpers/projects_helper.rb +5 -1

             # 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.
             module ProjectsHelper
+              def result_overview(text, token)
+                match = excerpt(text, token)
+                match ? highlight(match, token) : truncate(text, 150)
+              end
             end

app/views/projects/search.rhtml +9 -7

             <h2><%= l(:label_search) %></h2>
             <div class="box">
             <% form_tag({:action => 'search', :id => @project}, :method => :get) do %>
             <p><%= text_field_tag 'token', @token, :size => 30 %>
             <%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>
             <%= 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></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? Issue %>
-                      <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight(h(e.subject), @token) %><br />
+                        <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight(h(e.subject), @token) %><br />
-                          <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
+                        <%= result_overview(e.description, @token) %><br />
+                        <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
                     <% elsif e.is_a? News %>
-                      <%=l(:label_news)%>: <%= link_to highlight(h(e.title), @token), :controller => 'news', :action => 'show', :id => e %><br />
+                        <%=l(:label_news)%>: <%= link_to highlight(h(e.title), @token), :controller => 'news', :action => 'show', :id => e %><br />
-                          <% unless e.summary.empty? %><%=h e.summary %><br /><% end %>
+                        <%= result_overview(e.description, @token) %><br />
-                          <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
+                        <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
                     <% elsif e.is_a? Document %>
-                      <%=l(:label_document)%>: <%= link_to highlight(h(e.title), @token), :controller => 'documents', :action => 'show', :id => e %><br />
+                        <%=l(:label_document)%>: <%= link_to highlight(h(e.title), @token), :controller => 'documents', :action => 'show', :id => e %><br />
-                          <i><%= format_time(e.created_on) %></i>
+                        <%= result_overview(e.description, @token) %><br />
+                        <i><%= format_time(e.created_on) %></i>
                     <% end %>
                     </p></li>
                   <% end %>
                 </ul>
             <% end %>

test/fixtures/permissions.yml +166 -4

             ---
+            permissions_052:
+              action: destroy_comment
+              id: 52
+              description: label_comment_delete
+              controller: news
+              mail_enabled: false
+              mail_option: false
+              sort: 1133
+              is_public: false
             permissions_041:
               action: add_file
               id: 41
               description: button_add
               controller: projects
               mail_enabled: false
-              mail_option: false
+              mail_option: true
               sort: 1320
               is_public: false
             permissions_030:
               action: destroy
               id: 30
               description: button_delete
               controller: news
               mail_enabled: false
               mail_option: false
               sort: 1122
               is_public: false
             permissions_019:
               action: download
               id: 19
               description: button_download
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1010
               is_public: true
             permissions_008:
               action: edit
               id: 8
               description: button_edit
               controller: members
               mail_enabled: false
               mail_option: false
               sort: 221
               is_public: false
+            permissions_053:
+              action: add_query
+              id: 53
+              description: button_create
+              controller: projects
+              mail_enabled: false
+              mail_option: false
+              sort: 600
+              is_public: false
             permissions_042:
               action: destroy_file
               id: 42
               description: button_delete
               controller: versions
               mail_enabled: false
               mail_option: false
               sort: 1322
               is_public: false
             permissions_031:
               action: list_documents
               id: 31
               description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1200
               is_public: true
             permissions_020:
               action: add_issue
               id: 20
               description: button_add
               controller: projects
               mail_enabled: true
               mail_option: true
               sort: 1050
               is_public: false
             permissions_009:
               action: destroy
               id: 9
               description: button_delete
               controller: members
               mail_enabled: false
               mail_option: false
               sort: 222
               is_public: false
+            permissions_054:
+              action: show
+              id: 54
+              description: button_view
+              controller: repositories
+              mail_enabled: false
+              mail_option: false
+              sort: 1450
+              is_public: true
+            permissions_043:
+              action: move_issues
+              id: 43
+              description: button_move
+              controller: projects
+              mail_enabled: false
+              mail_option: false
+              sort: 1061
+              is_public: false
             permissions_032:
               action: show
               id: 32
               description: button_view
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1201
               is_public: true
             permissions_021:
               action: edit
               id: 21
               description: button_edit
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1055
               is_public: false
             permissions_010:
               action: add_version
               id: 10
               description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 320
               is_public: false
+            permissions_055:
+              action: browse
+              id: 55
+              description: label_browse
+              controller: repositories
+              mail_enabled: false
+              mail_option: false
+              sort: 1460
+              is_public: true
+            permissions_044:
+              action: add_note
+              id: 44
+              description: label_add_note
+              controller: issues
+              mail_enabled: false
+              mail_option: true
+              sort: 1057
+              is_public: false
             permissions_033:
               action: download
               id: 33
               description: button_download
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1202
               is_public: true
             permissions_022:
               action: change_status
               id: 22
               description: label_change_status
               controller: issues
               mail_enabled: true
               mail_option: true
               sort: 1060
               is_public: false
             permissions_011:
               action: edit
               id: 11
               description: button_edit
               controller: versions
               mail_enabled: false
               mail_option: false
               sort: 321
               is_public: false
+            permissions_056:
+              action: entry
+              id: 56
+              description: entry
+              controller: repositories
+              mail_enabled: false
+              mail_option: false
+              sort: 1462
+              is_public: true
+            permissions_045:
+              action: export_issues_pdf
+              id: 45
+              description: label_export_pdf
+              controller: projects
+              mail_enabled: false
+              mail_option: false
+              sort: 1002
+              is_public: true
             permissions_034:
               action: add_document
               id: 34
               description: button_add
               controller: projects
               mail_enabled: false
-              mail_option: false
+              mail_option: true
               sort: 1220
               is_public: false
             permissions_023:
               action: destroy
               id: 23
               description: button_delete
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1065
               is_public: false
             permissions_012:
               action: destroy
               id: 12
               description: button_delete
               controller: versions
               mail_enabled: false
               mail_option: false
               sort: 322
               is_public: false
             permissions_001:
               action: show
               id: 1
               description: label_overview
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 100
               is_public: true
+            permissions_057:
+              action: revisions
+              id: 57
+              description: label_view_revisions
+              controller: repositories
+              mail_enabled: false
+              mail_option: false
+              sort: 1470
+              is_public: true
+            permissions_046:
+              action: export_pdf
+              id: 46
+              description: label_export_pdf
+              controller: issues
+              mail_enabled: false
+              mail_option: false
+              sort: 1015
+              is_public: true
             permissions_035:
               action: edit
               id: 35
               description: button_edit
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1221
               is_public: false
             permissions_024:
               action: add_attachment
               id: 24
               description: label_attachment_new
               controller: issues
               mail_enabled: false
-              mail_option: false
+              mail_option: true
               sort: 1070
               is_public: false
             permissions_013:
               action: add_issue_category
               id: 13
               description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 420
               is_public: false
             permissions_002:
               action: changelog
               id: 2
               description: label_change_log
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 105
               is_public: true
+            permissions_058:
+              action: revision
+              id: 58
+              description: label_view_revisions
+              controller: repositories
+              mail_enabled: false
+              mail_option: false
+              sort: 1472
+              is_public: true
+            permissions_047:
+              action: activity
+              id: 47
+              description: label_activity
+              controller: projects
+              mail_enabled: false
+              mail_option: false
+              sort: 160
+              is_public: true
             permissions_036:
               action: destroy
               id: 36
               description: button_delete
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1222
               is_public: false
             permissions_025:
               action: destroy_attachment
               id: 25
               description: label_attachment_delete
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1075
               is_public: false
             permissions_014:
               action: edit
               id: 14
               description: button_edit
               controller: issue_categories
               mail_enabled: false
               mail_option: false
               sort: 421
               is_public: false
             permissions_003:
               action: issue_report
               id: 3
               description: label_report_plural
               controller: reports
               mail_enabled: false
               mail_option: false
               sort: 110
               is_public: true
+            permissions_059:
+              action: diff
+              id: 59
+              description: diff
+              controller: repositories
+              mail_enabled: false
+              mail_option: false
+              sort: 1480
+              is_public: true
+            permissions_048:
+              action: calendar
+              id: 48
+              description: label_calendar
+              controller: projects
+              mail_enabled: false
+              mail_option: false
+              sort: 165
+              is_public: true
             permissions_037:
               action: add_attachment
               id: 37
               description: label_attachment_new
               controller: documents
               mail_enabled: false
-              mail_option: false
+              mail_option: true
               sort: 1223
               is_public: false
             permissions_026:
               action: list_news
               id: 26
               description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1100
               is_public: true
             permissions_015:
               action: destroy
               id: 15
               description: button_delete
               controller: issue_categories
               mail_enabled: false
               mail_option: false
               sort: 422
               is_public: false
             permissions_004:
               action: settings
               id: 4
               description: label_settings
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 150
               is_public: false
+            permissions_060:
+              action: search
+              id: 61
+              description: label_search
+              controller: projects
+              mail_enabled: false
+              mail_option: false
+              sort: 130
+              is_public: true
+            permissions_049:
+              action: gantt
+              id: 49
+              description: label_gantt
+              controller: projects
+              mail_enabled: false
+              mail_option: false
+              sort: 166
+              is_public: true
             permissions_038:
               action: destroy_attachment
               id: 38
               description: label_attachment_delete
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1224
               is_public: false
             permissions_027:
               action: show
               id: 27
               description: button_view
               controller: news
               mail_enabled: false
               mail_option: false
               sort: 1101
               is_public: true
             permissions_016:
               action: list_issues
               id: 16
               description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1000
               is_public: true
             permissions_005:
               action: edit
               id: 5
               description: button_edit
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 151
               is_public: false
+            permissions_050:
+              action: history
+              id: 50
+              description: label_history
+              controller: issues
+              mail_enabled: false
+              mail_option: false
+              sort: 1006
+              is_public: true
             permissions_039:
               action: list_files
               id: 39
               description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1300
               is_public: true
             permissions_028:
               action: add_news
               id: 28
               description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1120
               is_public: false
             permissions_017:
               action: export_issues_csv
               id: 17
               description: label_export_csv
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1001
               is_public: true
             permissions_006:
               action: list_members
               id: 6
               description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 200
               is_public: true
+            permissions_051:
+              action: add_comment
+              id: 51
+              description: label_comment_add
+              controller: news
+              mail_enabled: false
+              mail_option: false
+              sort: 1130
+              is_public: false
             permissions_040:
               action: download
               id: 40
               description: button_download
               controller: versions
               mail_enabled: false
               mail_option: false
               sort: 1301
               is_public: true
             permissions_029:
               action: edit
               id: 29
               description: button_edit
               controller: news
               mail_enabled: false
               mail_option: false
               sort: 1121
               is_public: false
             permissions_018:
               action: show
               id: 18
               description: button_view
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1005
               is_public: true
             permissions_007:
               action: add_member
               id: 7
               description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 220
               is_public: false

test/functional/projects_controller_test.rb +10 0

             # 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.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'projects_controller'
             # Re-raise errors caught by the controller.
             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < Test::Unit::TestCase
               fixtures :projects, :permissions
               def setup
                 @controller = ProjectsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'list'
               end
               def test_list
                 get :list
                 assert_response :success
                 assert_template 'list'
                 assert_not_nil assigns(:projects)
               end
               def test_show
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
               end
               def test_list_members
                 get :list_members, :id => 1
                 assert_response :success
                 assert_template 'list_members'
                 assert_not_nil assigns(:members)
               end
               def test_list_documents
                 get :list_documents, :id => 1
                 assert_response :success
                 assert_template 'list_documents'
                 assert_not_nil assigns(:documents)
               end
               def test_list_issues
                 get :list_issues, :id => 1
                 assert_response :success
                 assert_template 'list_issues'
                 assert_not_nil assigns(:issues)
               end
               def test_list_issues_with_filter
                 get :list_issues, :id => 1, :set_filter => 1
                 assert_response :success
                 assert_template 'list_issues'
                 assert_not_nil assigns(:issues)
               end
               def test_list_issues_reset_filter
                 post :list_issues, :id => 1
                 assert_response :success
                 assert_template 'list_issues'
                 assert_not_nil assigns(:issues)
               end
               def test_export_issues_csv
                 get :export_issues_csv, :id => 1
                 assert_response :success
                 assert_not_nil assigns(:issues)
               end
               def test_list_news
                 get :list_news, :id => 1
                 assert_response :success
                 assert_template 'list_news'
                 assert_not_nil assigns(:news)
               end
               def test_list_files
                 get :list_files, :id => 1
                 assert_response :success
                 assert_template 'list_files'
                 assert_not_nil assigns(:versions)
               end
               def test_changelog
                 get :changelog, :id => 1
                 assert_response :success
                 assert_template 'changelog'
                 assert_not_nil assigns(:fixed_issues)
               end
+              def test_search
+                get :search, :id => 1
+                assert_response :success
+                assert_template 'search'
+                get :search, :id => 1, :token => "can", :scope => ["issues", "news", "documents"]
+                assert_response :success
+                assert_template 'search'
+              end
             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