jro_apps/redmine Commit - r2254:1ca69f2af1eb

Different icon for closed issues in search result (#992)....

Jean-Philippe Lang -

r2254:1ca69f2af1eb

parent child

Context file:

r2254:1ca69f2af1eb

app/models/issue.rb +2 -1

                                  # sort by id so that limited eager loading doesn't break with postgresql
                                  :order_column => "#{table_name}.id"
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
-                            :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}
+                            :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}},
+                            :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
               acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
                                         :author_key => :author_id

public/stylesheets/application.css +3 0

             div#activity dd span.description, #search-results dd span.description { display:block; }
             #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
             div#search-results-counts {float:right;}
             div#search-results-counts ul { margin-top: 0.5em; }
             div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
+            #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }
             div#roadmap fieldset.related-issues { margin-bottom: 1em; }
             div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
             div#roadmap .wiki h1:first-child { display: none; }

test/fixtures/issues.yml +17 0

@@ -108,4 +108,21 issues_007:
108	start_date: <%= 10.days.ago.to_s(:db) %>	108	start_date: <%= 10.days.ago.to_s(:db) %>
109	due_date: <%= Date.today.to_s(:db) %>	109	due_date: <%= Date.today.to_s(:db) %>
110	lock_version: 0	110	lock_version: 0
		111	issues_008:
		112	created_on: <%= 10.days.ago.to_date.to_s(:db) %>
		113	project_id: 1
		114	updated_on: <%= 10.days.ago.to_date.to_s(:db) %>
		115	priority_id: 3
		116	subject: Closed issue
		117	id: 8
		118	fixed_version_id:
		119	category_id:
		120	description: This is a closed issue.
		121	tracker_id: 1
		122	assigned_to_id:
		123	author_id: 2
		124	status_id: 5
		125	start_date:
		126	due_date:
		127	lock_version: 0
111	No newline at end of file	128

test/functional/search_controller_test.rb +11 0

@@ -45,6 +45,17 class SearchControllerTest < Test::Unit::TestCase
45	assert_tag :a, :content => 'Changesets (4)'	45	assert_tag :a, :content => 'Changesets (4)'
46	end	46	end
47		47
		48	def test_search_issues
		49	get :index, :q => 'issue', :issues => 1
		50	assert_response :success
		51	assert_template 'index'
		52
		53	assert assigns(:results).include?(Issue.find(8))
		54	assert assigns(:results).include?(Issue.find(5))
		55	assert_tag :dt, :attributes => { :class => /issue closed/ },
		56	:child => { :tag => 'a', :content => /Closed/ }
		57	end
		58
48	def test_search_project_and_subprojects	59	def test_search_project_and_subprojects
49	get :index, :id => 1, :q => 'recipe subproject', :scope => 'subprojects', :submit => 'Search'	60	get :index, :id => 1, :q => 'recipe subproject', :scope => 'subprojects', :submit => 'Search'
50	assert_response :success	61	assert_response :success

General Comments 0

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

No TODOs yet

	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