kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket/master/280-issue-autocomplete-match-issue-ids' of https://github.com/edavis10/chiliproject into edavis10_280-issue-autocomplete-match-issue-ids

Browse Source
This commit is contained in:
Felix Schäfer 2011-03-14 09:30:10 +01:00
commit 7415dcb620
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/auto_completes_controller.rb
View File

@ -9,7 +9,10 @@ class AutoCompletesController < ApplicationController
@issues << query.visible.find_by_id(q.to_i) @issues << query.visible.find_by_id(q.to_i)
end end
unless q.blank? unless q.blank?
@issues += query.visible.find(:all, :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%"], :limit => 10) @issues += query.visible.find(:all,
:limit => 10,
:order => "#{Issue.table_name}.id ASC",
:conditions => ["LOWER(#{Issue.table_name}.subject) LIKE :q OR CAST(#{Issue.table_name}.id AS CHAR(13)) LIKE :q", {:q => "%#{q.downcase}%" }])
end end
@issues.compact! @issues.compact!
render :layout => false render :layout => false

18
test/functional/auto_completes_controller_test.rb
View File

@ -16,6 +16,24 @@ class AutoCompletesControllerTest < ActionController::TestCase
assert_not_nil assigns(:issues) assert_not_nil assigns(:issues)
assert assigns(:issues).include?(Issue.find(13)) assert assigns(:issues).include?(Issue.find(13))
end end
test 'should return issues matching a given id' do
@project = Project.find('subproject1')
@issue_21 = Issue.generate_for_project!(@project, :id => 21)
@issue_101 = Issue.generate_for_project!(@project, :id => 101)
@issue_102 = Issue.generate_for_project!(@project, :id => 102)
@issue_with_subject = Issue.generate_for_project!(@project, :subject => 'This has 1 in the subject')
get :issues, :project_id => @project.id, :q => '1'
assert_response :success
assert_not_nil assigns(:issues)
assert assigns(:issues).include?(Issue.find(13))
assert assigns(:issues).include?(@issue_21)
assert assigns(:issues).include?(@issue_101)
assert assigns(:issues).include?(@issue_102)
assert assigns(:issues).include?(@issue_with_subject)
end
def test_auto_complete_with_scope_all_and_cross_project_relations def test_auto_complete_with_scope_all_and_cross_project_relations
Setting.cross_project_issue_relations = '1' Setting.cross_project_issue_relations = '1'