diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-08-09 16:43:12 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-08-09 16:43:12 +0000 |
| commit | 908b960e7181680cc180ab3d07921fc9977a39db (patch) | |
| tree | e41609d7468c7164cf2d02e8570646ecd4a355cd /app | |
| parent | 0ce0b52342dfb5fd6c444609ef0370f7fdd28230 (diff) | |
| download | redmine-908b960e7181680cc180ab3d07921fc9977a39db.tar.gz redmine-908b960e7181680cc180ab3d07921fc9977a39db.zip | |
Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10180 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/auto_completes_controller.rb | 20 | ||||
| -rw-r--r-- | app/views/issue_relations/_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/issues/_attributes.html.erb | 2 |
3 files changed, 11 insertions, 13 deletions
diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb index 203dae4e7..1bbcd33f8 100644 --- a/app/controllers/auto_completes_controller.rb +++ b/app/controllers/auto_completes_controller.rb @@ -20,25 +20,23 @@ class AutoCompletesController < ApplicationController def issues @issues = [] - q = (params[:q] || params[:term]).to_s - query = (params[:scope] == "all" && Setting.cross_project_issue_relations?) ? Issue : @project.issues - if q.match(/^\d+$/) - @issues << query.visible.find_by_id(q.to_i) + q = (params[:q] || params[:term]).to_s.strip + if q.present? + scope = (params[:scope] == "all" ? Issue : @project.issues).visible + if q.match(/^\d+$/) + @issues << scope.find_by_id(q.to_i) + end + @issues += scope.where("LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%").order("#{Issue.table_name}.id DESC").limit(10).all + @issues.compact! end - unless q.blank? - @issues += query.visible.find(:all, :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%"], :limit => 10) - end - @issues.compact! render :layout => false end private def find_project - project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id] - @project = Project.find(project_id) + @project = Project.find(params[:project_id]) rescue ActiveRecord::RecordNotFound render_404 end - end diff --git a/app/views/issue_relations/_form.html.erb b/app/views/issue_relations/_form.html.erb index efd58b3ee..a1db3802f 100644 --- a/app/views/issue_relations/_form.html.erb +++ b/app/views/issue_relations/_form.html.erb @@ -9,6 +9,6 @@ <%= toggle_link l(:button_cancel), 'new-relation-form'%> </p> -<%= javascript_tag "observeAutocompleteField('relation_issue_to_id', '#{escape_javascript auto_complete_issues_path(:id => @issue, :project_id => @project, :scope => 'all')}')" %> +<%= javascript_tag "observeAutocompleteField('relation_issue_to_id', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil))}')" %> <%= javascript_tag "setPredecessorFieldsVisibility();" %> diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index a80fac9ce..8bf7dc0ae 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -43,7 +43,7 @@ <div class="splitcontentright"> <% if @issue.safe_attribute? 'parent_issue_id' %> <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p> -<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:id => @issue, :project_id => @issue.project)}')" %> +<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project)}')" %> <% end %> <% if @issue.safe_attribute? 'start_date' %> |