summaryrefslogtreecommitdiffstats
path: root/app/controllers/auto_completes_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/auto_completes_controller.rb')
-rw-r--r--app/controllers/auto_completes_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb
index 1438106f6..a3ed88e36 100644
--- a/app/controllers/auto_completes_controller.rb
+++ b/app/controllers/auto_completes_controller.rb
@@ -4,11 +4,12 @@ class AutoCompletesController < ApplicationController
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
render :layout => false
end