diff app/controllers/auto_completes_controller.rb @ 514:7eba09d624db live

Merge

--- a/app/controllers/auto_completes_controller.rb	Thu Jul 14 10:46:20 2011 +0100
+++ b/app/controllers/auto_completes_controller.rb	Thu Jul 14 10:50:53 2011 +0100
@@ -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