Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/text-base/auto_completes_controller.rb.svn-base @ 119:8661b858af72
* Update to Redmine trunk rev 4705
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:12:06 +0000 |
parents | 1d32c0a0efbf |
children |
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/auto_completes_controller.rb.svn-base Fri Nov 19 14:05:24 2010 +0000 +++ b/app/controllers/.svn/text-base/auto_completes_controller.rb.svn-base Thu Jan 13 14:12:06 2011 +0000 @@ -4,12 +4,14 @@ def issues @issues = [] q = params[:q].to_s + query = (params[:scope] == "all" && Setting.cross_project_issue_relations?) ? Issue : @project.issues if q.match(/^\d+$/) - @issues << @project.issues.visible.find_by_id(q.to_i) + @issues << query.visible.find_by_id(q.to_i) end unless q.blank? - @issues += @project.issues.visible.find(:all, :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%"], :limit => 10) + @issues += query.visible.find(:all, :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%"], :limit => 10) end + @issues.compact! render :layout => false end