jro_apps/redmine Commit - r486:ebe10fa6452d

Added a quick search form in page header. Search functionality moved to a dedicated controller....

Jean-Philippe Lang -

r486:ebe10fa6452d

parent child

Context file:

r486:ebe10fa6452d

Collapse all files

app/controllers/search_controller.rb created 644 +75 0

@@ -0,0 +1,75
	1	# redMine - project management software
	2	# Copyright (C) 2006 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	class SearchController < ApplicationController
	19	layout 'base'
	20
	21	def index
	22	@question = params[:q] \|\| ""
	23	@question.strip!
	24	@all_words = params[:all_words] \|\| (params[:submit] ? false : true)
	25	@scope = params[:scope] \|\| (params[:submit] ? [] : %w(projects issues changesets news documents wiki) )
	26
	27	# quick jump to an issue
	28	if @scope.include?('issues') && @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(logged_in_user))
	29	redirect_to :controller => "issues", :action => "show", :id => $1
	30	return
	31	end
	32
	33	if params[:id]
	34	find_project
	35	return unless check_project_privacy
	36	end
	37
	38	# tokens must be at least 3 character long
	39	@tokens = @question.split.uniq.select {\|w\| w.length > 2 }
	40
	41	if !@tokens.empty?
	42	# no more than 5 tokens to search for
	43	@tokens.slice! 5..-1 if @tokens.size > 5
	44	# strings used in sql like statement
	45	like_tokens = @tokens.collect {\|w\| "%#{w.downcase}%"}
	46	operator = @all_words ? " AND " : " OR "
	47	limit = 10
	48	@results = []
	49	if @project
	50	@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'
	51	@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'
	52	@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	@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	@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')
	55	else
	56	Project.with_scope(:find => {:conditions => Project.visible_by(logged_in_user)}) do
	57	@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'
	58	end
	59	# if only one project is found, user is redirected to its overview
	60	redirect_to :controller => 'projects', :action => 'show', :id => @results.first and return if @results.size == 1
	61	end
	62	@question = @tokens.join(" ")
	63	else
	64	@question = ""
	65	end
	66	end
	67
	68	private
	69	def find_project
	70	@project = Project.find(params[:id])
	71	@html_title = @project.name
	72	rescue ActiveRecord::RecordNotFound
	73	render_404
	74	end
	75	end

app/helpers/search_helper.rb created 644 +28 0

@@ -0,0 +1,28
	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 SearchHelper
	19	def highlight_tokens(text, tokens)
	20	return text unless tokens && !tokens.empty?
	21	regexp = Regexp.new "(#{tokens.join('\|')})", Regexp::IGNORECASE
	22	result = ''
	23	text.split(regexp).each_with_index do \|words, i\|
	24	result << (i.even? ? (words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', words, :class => 'highlight'))
	25	end
	26	result
	27	end
	28	end

test/functional/search_controller_test.rb created 644 +48 0

@@ -0,0 +1,48
	1	require File.dirname(__FILE__) + '/../test_helper'
	2	require 'search_controller'
	3
	4	# Re-raise errors caught by the controller.
	5	class SearchController; def rescue_action(e) raise e end; end
	6
	7	class SearchControllerTest < Test::Unit::TestCase
	8	fixtures :projects, :issues
	9
	10	def setup
	11	@controller = SearchController.new
	12	@request = ActionController::TestRequest.new
	13	@response = ActionController::TestResponse.new
	14	end
	15
	16	def test_search_for_projects
	17	get :index
	18	assert_response :success
	19	assert_template 'index'
	20
	21	get :index, :q => "cook"
	22	assert_response :success
	23	assert_template 'index'
	24	assert assigns(:results).include?(Project.find(1))
	25	end
	26
	27	def test_search_in_project
	28	get :index, :id => 1
	29	assert_response :success
	30	assert_template 'index'
	31	assert_not_nil assigns(:project)
	32
	33	get :index, :id => 1, :q => "can", :scope => ["issues", "news", "documents"]
	34	assert_response :success
	35	assert_template 'index'
	36	end
	37
	38	def test_quick_jump_to_issue
	39	# issue of a public project
	40	get :index, :q => "3"
	41	assert_redirected_to 'issues/show/3'
	42
	43	# issue of a private project
	44	get :index, :q => "4"
	45	assert_response :success
	46	assert_template 'index'
	47	end
	48	end

app/controllers/projects_controller.rb +1 -27

             # 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 "#{Project.table_name}.name", "asc"
                 sort_update
                 @project_count = Project.count(:all, :conditions => Project.visible_by(logged_in_user))
                 @project_pages = Paginator.new self, @project_count,
 ,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => Project.visible_by(logged_in_user),
             						:include => :parent,
             						: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 "1" == params[:wiki_enabled]
                     @project.wiki = Wiki.new
                     @project.wiki.attributes = params[:wiki]
                   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_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.children if @project.children.size > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = Tracker.find(:all, :order => 'position')
                 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.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
                   if params[:wiki_enabled]
                     case params[:wiki_enabled]
                     when "0"
                       @project.wiki.destroy if @project.wiki
                     when "1"
                       @project.wiki ||= Wiki.new
                       @project.wiki.update_attributes params[:wiki]
                     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')
                 default_status = IssueStatus.default
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 @issue.status = default_status
                 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker))if logged_in_user
                 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]
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   @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 "#{Issue.table_name}.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, :custom_values], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
               						:include => [ :assigned_to, :status, :tracker, :project, :priority, :custom_values ],
               						: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 "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                 ic = Iconv.new(l(:general_csv_encoding), '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_assigned_to),
                                    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.assigned_to ? issue.assigned_to.name : ""),
                                         issue.author.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 "#{Issue.table_name}.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 ],
             						: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)}
                 # 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.table_name}.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')
                 retrieve_selected_tracker_ids(@trackers)
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "#{IssueStatus.table_name}.is_closed=? and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}) and #{Issue.table_name}.fixed_version_id is not null", true],
                   :order => "#{Version.table_name}.effective_date DESC, #{Issue.table_name}.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
               def roadmap
                 @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.find(:all,
                   :conditions => [ "#{Version.table_name}.effective_date>?", Date.today],
                   :order => "#{Version.table_name}.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], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.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.table_name}.created_on>=? and #{News.table_name}.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 => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.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 => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.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 #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.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
                 unless params[:show_wiki_edits] == "0"
                   select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
                            "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
                   joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
                           "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
                   conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
                                 @project.id, @date_from, @date_to]
                   WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions).each { |i|
                     # We provide this alias so all events can be treated in the same manner
                     def i.created_on
                       self.updated_on
                     end
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_wiki_edits = 1
                 end
                 unless @project.repository.nil? || params[:show_changesets] == "0"
                   @project.repository.changesets.find(:all, :conditions => ["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to]).each { |i|
                     def i.created_on
                       self.committed_on
                     end
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_changesets = 1
                 end
                 render :layout => false if request.xhr?
               end
               def calendar
                 @trackers = Tracker.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 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)
                 @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 @ending_events_by_days = @events.group_by {|event| event.due_date}
                 @starting_events_by_days = @events.group_by {|event| event.start_date}
                 render :layout => false if request.xhr?
               end
               def gantt
                 @trackers = Tracker.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 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
                 @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :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 and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 @events.sort! {|x,y| x.start_date <=> y.start_date }
                 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
-                @question = params[:q] || ""
-                @question.strip!
-                @all_words = params[:all_words] || (params[:submit] ? false : true)
-                @scope = params[:scope] || (params[:submit] ? [] : %w(issues changesets news documents wiki) )
-                # 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 = []
-                  @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'
-                  @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.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comments) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
-                  @question = @tokens.join(" ")
-                else
-                  @question = ""
-                end
-              end
               def feeds
                 @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
                 @key = logged_in_user.get_or_create_rss_key.value if logged_in_user
               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
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               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 0 -10

             # 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 highlight_tokens(text, tokens)
-                return text unless tokens && !tokens.empty?
-                regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE
-                result = ''
-                text.split(regexp).each_with_index do |words, i|
-                  result << (i.even? ? (words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', words, :class => 'highlight'))
-                end
-                result
-              end
             end

app/views/layouts/base.rhtml +14 -4

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%= Setting.app_title + (@html_title ? ": #{@html_title}" : "") %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="redMine" />
             <meta name="keywords" content="issue,bug,tracker" />
             <!--[if IE]>
                 <style type="text/css">
                 body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
                 </style>
             <![endif]-->
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "print", :media => "print" %>
             <%= javascript_include_tag :defaults %>
             <%= javascript_include_tag 'menu' %>
             <%= stylesheet_link_tag 'jstoolbar' %>
             <!-- page specific tags --><%= yield :header_tags %>
             </head>
             <body>
             <div id="container" >
                 <div id="header">
                 <div style="float: left;">
                     <h1><%= Setting.app_title %></h1>
                     <h2><%= Setting.app_subtitle %></h2>
                 </div>
                 <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
-                  <% if loggedin? %><small><%=l(:label_logged_as)%> <b><%= @logged_in_user.login %></b></small><% end %>
+                  <% if loggedin? %><small><%=l(:label_logged_as)%> <strong><%= @logged_in_user.login %></strong> -</small><% end %>
+                  <small><%= toggle_link 'Search', 'quick-search-form', :focus => 'quick-search-input' %></small>
+                  <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get, :id => 'quick-search-form', :style => "display:none;" ) do %>
+                    <%= text_field_tag 'q', @question, :size => 15, :class => 'small', :id => 'quick-search-input' %>
+                  <% end %>
+                </div>
                 </div>
-                </div>
             	<div id="navigation">
             		<ul>
             	<li><%= link_to l(:label_home), { :controller => 'welcome' }, :class => "icon icon-home" %></li>
             	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>
             	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
                 <% unless @project.nil? || @project.id.nil? %>
                     <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
                 <% end %>
                 <% if loggedin? %>
             		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "icon icon-user" %></li>
                 <% end %>
             	<% if admin_loggedin? %>
             		<li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "icon icon-admin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
             	<% end %>
             	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "icon icon-help" %></li>
             	<% if loggedin? %>
             		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "icon icon-user" %></li>
             	<% else %>
             		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "icon icon-user" %></li>
             	<% end %>
+            	<% unless @project.nil? || @project.id.nil? %>
+                  <li class="right" style="padding-right:0.8em;">
+                  </li>
+                <% end %>
             		</ul>
             	</div>
                 <% if admin_loggedin? %>
             		<%= render :partial => 'admin/menu' %>
                 <% end %>
                 <% unless @project.nil? || @project.id.nil? %>
                 <div id="menuProject" class="menu" onmouseover="menuMouseover(event)">
                     <%= link_to l(:label_calendar), {:controller => 'projects', :action => 'calendar', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_gantt), {:controller => 'projects', :action => 'gantt', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 }, :class => "menuItem" %>
                     <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_activity), {:controller => 'projects', :action => 'activity', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %>
                     <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %>
-                    <%= link_to l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %>
+                    <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %>
                     <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %>
                 </div>
                 <% end %>
             	<div id="subcontent">
             		<% unless @project.nil? || @project.id.nil? %>
             			<h2><%= @project.name %></h2>
             			<ul class="menublock">
             				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
             				<li><%= link_to l(:label_calendar), :controller => 'projects', :action => 'calendar', :id => @project %></li>
             				<li><%= link_to l(:label_gantt), :controller => 'projects', :action => 'gantt', :id => @project %></li>
             				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></li>
             				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
             				<li><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => @project %></li>
             				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
             				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
             				<li><%= link_to l(:label_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %></li>
             				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
             				<%= content_tag("li", link_to(l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil)) if @project.wiki and !@project.wiki.new_record? %>
             				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
-            				<li><%= link_to l(:label_search), :controller => 'projects', :action => 'search', :id => @project %></li>
+            				<li><%= link_to l(:label_search), :controller => 'search', :action => 'index', :id => @project %></li>
             				<%= content_tag("li", link_to(l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project)) if @project.repository and !@project.repository.new_record? %>
             				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
             			</ul>
             		<% end %>
             		<% if loggedin? and @logged_in_user.memberships.length > 0 %>
             			<h2><%=l(:label_my_projects) %></h2>
             			<ul class="menublock">
             				<% for membership in @logged_in_user.memberships %>
             					<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %></li>
             				<% end %>
             			</ul>
             		<% end %>
             	</div>
             	<div id="content">
             		<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
             		<%= yield %>
             	</div>
             	<div id="ajax-indicator" style="display:none;">
             	   <span><%= l(:label_loading) %></span>
             	</div>
             	<div id="footer">
             		<p><a href="http://redmine.rubyforge.org/">redMine</a> <small><%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang</small></p>
             	</div>
             </div>
             </body>
             </html>

app/views/search/index.rhtml ~~app/views/projects/search.rhtml~~ renamed +57 -49

@@ -1,50 +1,58
1	<h2><%= l(:label_search) %></h2>	1	<h2><%= l(:label_search) %></h2>
2		2
3	<div class="box">	3	<div class="box">
4	<% form_tag({~~:action~~ => ~~'search'~~, ~~:id~~ => ~~@project~~}, :method => :get) do %>	4	<% form_tag({}, :method => :get) do %>
5	<p><%= text_field_tag 'q', @question, :size => 30 %>	5	<p><%= text_field_tag 'q', @question, :size => 30 %>
6	<%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>	6
7	<% if @project.~~repository~~ %>	7	<% if @project %>
8	<%= check_box_tag 'scope[]', '~~changeset~~s', (@scope.include? '~~changeset~~s') %> <label><%= l(:label_~~revision~~_plural) %></label>	8	<%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>
9	<% end %>	9	<% if @project.repository %>
10	<%= check_box_tag 'scope[]', '~~new~~s', (@scope.include? '~~new~~s') %> <label><%= l(:label_~~news~~_plural) %></label>	10	<%= check_box_tag 'scope[]', 'changesets', (@scope.include? 'changesets') %> <label><%= l(:label_revision_plural) %></label>
11	<%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label>	11	<% end %>
12	<% if @project.wiki %>	12	<%= check_box_tag 'scope[]', 'news', (@scope.include? 'news') %> <label><%= l(:label_news_plural) %></label>
13	<%= check_box_tag 'scope[]', '~~wiki~~', (@scope.include? '~~wiki~~') %> <label><%= l(:label_~~wiki~~) %></label>	13	<%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label>
14	<% end %>	14	<% if @project.wiki %>
15	<br />	15	<%= check_box_tag 'scope[]', 'wiki', (@scope.include? 'wiki') %> <label><%= l(:label_wiki) %></label>
16	<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>	16	<% end %>
17	<%= submit_tag l(:button_submit), :name => 'submit' %>	17	<% else %>
18	<% end %>	18	<%= check_box_tag 'scope[]', 'projects', (@scope.include? 'projects') %> <label><%= l(:label_project_plural) %></label>
19	</div>	19	<% end %>
20		20	<br />
21	<% if @results %>	21	<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>
22	<h3><%= lwr(:label_result, @results.length) %></h3>	22	<%= submit_tag l(:button_submit), :name => 'submit' %>
23	<ul>	23	<% end %>
24	<% @results.each do \|e\| %>	24	</div>
25	<li><p>	25
26	<% if e.is_a? Issue %>	26	<% if @results %>
27	<%= link_to_issue e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />	27	<h3><%= lwr(:label_result, @results.length) %></h3>
28	<%= highlight_tokens(e.description, @tokens) %><br />	28	<ul>
29	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>	29	<% @results.each do \|e\| %>
30	<% elsif e.is_a? News %>	30	<li><p>
31	<%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />	31	<% if e.is_a? Project %>
32	<%= highlight_tokens(e.description, @tokens) %><br />	32	<%= link_to highlight_tokens(h(e.name), @tokens), :controller => 'projects', :action => 'show', :id => e %><br />
33	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>	33	<%= highlight_tokens(e.description, @tokens) %>
34	<% elsif e.is_a? ~~Document~~ %>	34	<% elsif e.is_a? Issue %>
35	<%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />	35	<%= link_to_issue e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />
36	<%= highlight_tokens(e.description, @tokens) %><br />	36	<%= highlight_tokens(e.description, @tokens) %><br />
37	<i><%= format_time(e.created_on) %></i>	37	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
38	<% elsif e.is_a? ~~WikiPage~~ %>	38	<% elsif e.is_a? News %>
39	<%=l(:label_~~wiki~~)%>: <%= link_to highlight_tokens(h(e.~~pretty_~~title), @tokens), :controller => '~~wiki~~', :action => '~~index~~', :id => ~~@project~~, ~~:page~~ => e.~~title~~ %><br />	39	<%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />
40	<%= highlight_tokens(e.con~~tent~~.~~text~~, @tokens) %><br />	40	<%= highlight_tokens(e.description, @tokens) %><br />
41	<i><%= e.~~content~~.~~author~~ ? e.~~content~~.author.name : ~~"Anonymous"~~ %>, <%= format_time(e.c~~ontent~~.~~upd~~ated_on) %></i>	41	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
42	<% elsif e.is_a? ~~Changese~~t %>	42	<% elsif e.is_a? Document %>
43	<%=l(:label_~~revision~~)%> <%= link_to h(e.~~revision~~), :controller => '~~repositorie~~s', :action => '~~revision~~', :id => ~~@project~~, ~~:rev~~ => e.~~revision~~ %><br />	43	<%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />
44	<%= highlight_tokens(e.co~~mme~~nts, @tokens) %><br />	44	<%= highlight_tokens(e.description, @tokens) %><br />
45	<em><%= e.committer.blank? ? e.committer : "Anonymous" %>, <%= format_time(e.committed_on) %></em>	45	<i><%= format_time(e.created_on) %></i>
46	<% end %>	46	<% elsif e.is_a? WikiPage %>
47	</p></li>	47	<%=l(:label_wiki)%>: <%= link_to highlight_tokens(h(e.pretty_title), @tokens), :controller => 'wiki', :action => 'index', :id => @project, :page => e.title %><br />
48	<% end %>	48	<%= highlight_tokens(e.content.text, @tokens) %><br />
49	</ul>	49	<i><%= e.content.author ? e.content.author.name : "Anonymous" %>, <%= format_time(e.content.updated_on) %></i>
		50	<% elsif e.is_a? Changeset %>
		51	<%=l(:label_revision)%> <%= link_to h(e.revision), :controller => 'repositories', :action => 'revision', :id => @project, :rev => e.revision %><br />
		52	<%= highlight_tokens(e.comments, @tokens) %><br />
		53	<em><%= e.committer.blank? ? e.committer : "Anonymous" %>, <%= format_time(e.committed_on) %></em>
		54	<% end %>
		55	</p></li>
		56	<% end %>
		57	</ul>
50	<% end %> No newline at end of file	58	<% end %>

public/stylesheets/application.css +2 0

             /* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
             /* Edited by Jean-Philippe Lang *>
             /**************** Body and tag styles ****************/
             #header * {margin:0; padding:0;}
             p, ul, ol, li {margin:0; padding:0;}
             body{
             font:76% Verdana,Tahoma,Arial,sans-serif;
             line-height:1.4em;
             text-align:center;
             color:#303030;
             background:#e8eaec;
             margin:0;
             }
             a{color:#467aa7;font-weight:bold;text-decoration:none;background-color:inherit;}
             a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
             a img{border:none;}
             p{margin:0 0 1em 0;}
             p form{margin-top:0; margin-bottom:20px;}
             img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
             img.left{float:left; margin:0 12px 5px 0;}
             img.center{display:block; margin:0 auto 5px auto;}
             img.right{float:right; margin:0 0 5px 12px;}
             /**************** Header and navigation styles ****************/
             #container{
             width:100%;
             min-width: 800px;
             margin:0;
             padding:0;
             text-align:left;
             background:#ffffff;
             color:#303030;
             }
             #header{
             height:4.5em;
             margin:0;
             background:#467aa7;
             color:#ffffff;
             margin-bottom:1px;
             }
             #header h1{
             padding:10px 0 0 20px;
             font-size:2em;
             background-color:inherit;
             color:#fff;
             letter-spacing:-1px;
             font-weight:bold;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #header h2{
             margin:3px 0 0 40px;
             font-size:1.5em;
             background-color:inherit;
             color:#f0f2f4;
             letter-spacing:-1px;
             font-weight:normal;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
+            #header a {color:#fff;}
             #navigation{
             height:2.2em;
             line-height:2.2em;
             margin:0;
             background:#578bb8;
             color:#ffffff;
             }
             #navigation li{
             float:left;
             list-style-type:none;
             border-right:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li.right {
              float:right;
             list-style-type:none;
             border-right:0;
             border-left:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li a{
             display:block;
             padding:0px 10px 0px 22px;
             font-size:0.8em;
             font-weight:normal;
             text-decoration:none;
             background-color:inherit;
             color: #ffffff;
             }
             #navigation li.submenu {background:url(../images/arrow_down.png) 96% 80% no-repeat;}
             #navigation li.submenu a {padding:0px 16px 0px 22px;}
             * html #navigation a {width:1%;}
             #navigation .selected,#navigation a:hover{
             color:#ffffff;
             text-decoration:none;
             background-color: #80b0da;
             }
             /**************** Icons *******************/
             .icon {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             vertical-align: middle;
             }
             #navigation .icon {
             background-position: 4px 50%;
             }
             .icon22 {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 26px;
             line-height: 22px;
             vertical-align: middle;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-pdf { background-image: url(../images/pdf.png); }
             .icon-csv { background-image: url(../images/csv.png); }
             .icon-html { background-image: url(../images/html.png); }
             .icon-txt { background-image: url(../images/txt.png); }
             .icon-file { background-image: url(../images/file.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-home { background-image: url(../images/home.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-mypage { background-image: url(../images/user_page.png); }
             .icon-admin { background-image: url(../images/admin.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-logout { background-image: url(../images/logout.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-index  { background-image: url(../images/index.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-feed  { background-image: url(../images/feed.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }
             .icon22-options { background-image: url(../images/22x22/options.png); }
             .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
             .icon22-authent { background-image: url(../images/22x22/authent.png); }
             .icon22-info { background-image: url(../images/22x22/info.png); }
             .icon22-comment { background-image: url(../images/22x22/comment.png); }
             .icon22-package { background-image: url(../images/22x22/package.png); }
             .icon22-settings { background-image: url(../images/22x22/settings.png); }
             /**************** Content styles ****************/
             html>body #content {
             height: auto;
             min-height: 500px;
             }
             #content{
             width: auto;
             height:500px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             margin-left: 120px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2, #content div.wiki h1 {
             display:block;
             margin:0 0 16px 0;
             font-size:1.7em;
             font-weight:normal;
             letter-spacing:-1px;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #content h2 a{font-weight:normal;}
             #content h3{margin:0 0 12px 0; font-size:1.4em;color:#707070;font-family: Trebuchet MS,Georgia,"Times New Roman",serif;}
             #content h4{font-size: 1em; margin-bottom: 12px; margin-top: 20px; font-weight: normal; border-bottom: dotted 1px #c0c0c0;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             #content dt{font-weight:bold; margin-bottom:5px;}
             #content dd{margin:0 0 10px 15px;}
             #content .tabs{height: 2.6em;}
             #content .tabs ul{margin:0;}
             #content .tabs ul li{
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1em;
             padding:4px;
             border: 1px solid #c0c0c0;
             }
             #content .tabs ul li a.selected, #content .tabs ul li a:hover{
             background-color: #80b0da;
             border: 1px solid #80b0da;
             color: #fff;
             text-decoration:none;
             }
             /***********************************************/
             form {display: inline;}
             blockquote {padding-left: 6px; border-left: 2px solid #ccc;}
             input, select {vertical-align: middle; margin-bottom: 4px;}
             input.button-small {font-size: 0.8em;}
             textarea.wiki-edit { width: 99.5%; }
             .select-small {font-size: 0.8em;}
             label {font-weight: bold; font-size: 1em; color: #505050;}
             fieldset {border:1px solid #c0c0c0; padding: 6px;}
             legend {color: #505050;}
             .required {color: #bb0000;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             hr { border:0; border-top: dotted 1px #fff; border-bottom: dotted 1px #c0c0c0; }
             table p {margin:0; padding:0;}
             .highlight { background-color: #FCFD8D;}
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .4em .5em 0 0;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             ul.documents {
             list-style-type: none;
             padding: 0;
             margin: 0;
             }
             ul.documents li {
             background-image: url(../images/32x32/file.png);
             background-repeat: no-repeat;
             background-position: 0 1px;
             padding-left: 36px;
             margin-bottom: 10px;
             margin-left: -37px;
             }
             /********** Table used to display lists of things ***********/
             table.list {
                 width:100%;
                 border-collapse: collapse;
                 border: 1px dotted #d0d0d0;
                 margin-bottom: 6px;
             }
             table.with-cells td {
                 border: 1px solid #d7d7d7;
             }
             table.list td {
                 padding:2px;
             }
             table.list thead th {
                 text-align: center;
                 background: #eee;
                 border: 1px solid #d7d7d7;
                 color: #777;
             }
             table.list tbody th {
             	font-weight: bold;
                 background: #eed;
                 border: 1px solid #d7d7d7;
                 color: #777;
             }
             /********** Validation error messages *************/
             #errorExplanation {
               width: 400px;
               border: 0;
               padding: 7px;
               padding-bottom: 3px;
               margin-bottom: 0px;
             }
             #errorExplanation h2 {
               text-align: left;
               font-weight: bold;
               padding: 5px 5px 10px 26px;
               font-size: 1em;
               margin: -7px;
               background: url(../images/alert.png) no-repeat 6px 6px;
             }
             #errorExplanation p {
               color: #333;
               margin-bottom: 0;
               padding: 5px;
             }
             #errorExplanation ul li {
               font-size: 1em;
               list-style: none;
               margin-left: -16px;
             }
             /*==========  Drop down menu  ==============*/
             div.menu {
               background-color: #FFFFFF;
               border-style: solid;
               border-width: 1px;
               border-color: #7F9DB9;
               position: absolute;
               top: 0px;
               left: 0px;
               padding: 0;
               visibility: hidden;
               z-index: 101;
             }
             div.menu a.menuItem {
               font-size: 10px;
               font-weight: normal;
               line-height: 2em;
               color: #000000;
               background-color: #FFFFFF;
               cursor: default;
               display: block;
               padding: 0 1em;
               margin: 0;
               border: 0;
               text-decoration: none;
               white-space: nowrap;
             }
             div.menu a.menuItem:hover, div.menu a.menuItemHighlight {
               background-color: #80b0da;
               color: #ffffff;
             }
             div.menu a.menuItem span.menuItemText {}
             div.menu a.menuItem span.menuItemArrow {
               margin-right: -.75em;
             }
             /**************** Sidebar styles ****************/
             #subcontent{
             position: absolute;
             left: 0px;
             width:95px;
             padding:20px 20px 10px 5px;
             overflow: hidden;
             }
             #subcontent h2{
             display:block;
             margin:0 0 5px 0;
             font-size:1.0em;
             font-weight:bold;
             text-align:left;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #subcontent p{margin:0 0 16px 0; font-size:0.9em;}
             /**************** Menublock styles ****************/
             .menublock{margin:0 0 20px 8px; font-size:0.8em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
             .menublock li ul{margin:0; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             /**************** Footer styles ****************/
             #footer{
             clear:both;
             padding:5px 0;
             margin:0;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             }
             #footer p{padding:0; margin:0; text-align:center;}
             #footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
             #footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
             /**************** Misc classes and styles ****************/
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             .clear{clear:both;}
             .small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
             .hide{display:none;}
             .textcenter{text-align:center;}
             .textright{text-align:right;}
             .important{color:#f02025; background-color:inherit; font-weight:bold;}
             .box{
             margin:0 0 20px 0;
             padding:10px;
             border:1px solid #c0c0c0;
             background-color:#fafbfc;
             color:#505050;
             line-height:1.5em;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             .rightbox{
             background: #fafbfc;
             border: 1px solid #c0c0c0;
             float: right;
             padding: 8px;
             position: relative;
             margin: 0 5px 5px;
             }
             .overlay{
             position: absolute;
             margin-left:0;
             z-index: 50;
             }
             .layout-active {
             background: #ECF3E1;
             }
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             .login {
             width: 50%;
             text-align: left;
             }
             img.calendar-trigger {
                 cursor: pointer;
                 vertical-align: middle;
                 margin-left: 4px;
             }
             #history p {
                 margin-left: 34px;
             }
             .progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
                 padding: 3px;
                 width: 40em;
                 text-align: center;
             }
             .progress td { height: 1em; }
             .progress .closed { background: #BAE0BA none repeat scroll 0%; }
             .progress .open { background: #FFF none repeat scroll 0%; }
             /***** Contextual links div *****/
             .contextual {
             float: right;
             font-size: 0.8em;
             line-height: 16px;
             padding: 2px;
             }
             .contextual select, .contextual input {
             font-size: 1em;
             }
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:0.8em;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             /***** CSS FORM ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             }
             .tabular label{
             font-weight: bold;
             float: left;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .error {
             color: #cc0000;
             }
             #settings .tabular p{ padding-left: 300px; }
             #settings .tabular label{ margin-left: -300px; width: 295px; }
             /*.threepxfix class below:
             Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.
             to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepxtest.html
             */
             * html .threepxfix{
             margin-left: 3px;
             }
             /***** Wiki sections ****/
             #content div.wiki { font-size: 110%}
             #content div.wiki h2, div.wiki h3 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; color:#606060; }
             #content div.wiki h2 { font-size: 1.4em;}
             #content div.wiki h3 { font-size: 1.2em;}
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
             }
             div.wiki table, div.wiki td {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
             div.wiki code {
                 font-size: 1.2em;
             }
             #preview .preview { background: #fafbfc url(../images/draft.png); }
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             filter:alpha(opacity=50);
             -moz-opacity:0.5;
             opacity: 0.5;
             -khtml-opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }

test/functional/projects_controller_test.rb 0 -10

             # 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_roadmap
                 get :roadmap, :id => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
               end
               def test_activity
                 get :activity, :id => 1
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
               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