Skip to content

O
OHR Support
Commit dbd6dfc6 authored by Gregor Schmidt's avatar Gregor Schmidt
Browse files
Options

[#373] Refactoring auto_completes#issues action 

hoping to make it more intention revealing
parent 85092129
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
app/controllers/auto_completes_controller.rb
View file @ dbd6dfc6
...@@ -4,18 +4,18 @@ class AutoCompletesController < ApplicationController ...@@ -4,18 +4,18 @@ class AutoCompletesController < ApplicationController
def issues def issues
@issues = [] @issues = []
q = params[:q].to_s q = params[:q].to_s
query = (params[:scope] == "all" && Setting.cross_project_issue_relations?) ? Issue : @project.issues
if q.match(/^\d+$/) if q.present?
@issues << query.visible.find_by_id(q.to_i) query = (params[:scope] == "all" && Setting.cross_project_issue_relations?) ? Issue : @project.issues
end
unless q.blank? @issues |= query.visible.find_all_by_id(q.to_i) if q =~ /^\d+$/
@issues += query.visible.find(:all,
@issues |= query.visible.find(:all,
:limit => 10, :limit => 10,
:order => "#{Issue.table_name}.id ASC", :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}%" }]) :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.uniq!
render :layout => false render :layout => false
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment