diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-12 16:04:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-12 16:04:28 +0000 |
| commit | a8b12bcb520230b9cc25abd2d7346d746c49874d (patch) | |
| tree | 6502eaf3291938d6c540fad2e15524c280c04357 /app | |
| parent | 758f2f0a4efdab9b8e4654efb71fbbdd81fa7b00 (diff) | |
| download | redmine-a8b12bcb520230b9cc25abd2d7346d746c49874d.tar.gz redmine-a8b12bcb520230b9cc25abd2d7346d746c49874d.zip | |
Autocomplete issue relations on subject (#3170).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4502 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/auto_completes_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/issue_relations/_form.rhtml | 4 |
2 files changed, 6 insertions, 3 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 diff --git a/app/views/issue_relations/_form.rhtml b/app/views/issue_relations/_form.rhtml index 0de386306..fdf0582ff 100644 --- a/app/views/issue_relations/_form.rhtml +++ b/app/views/issue_relations/_form.rhtml @@ -1,7 +1,9 @@ <%= error_messages_for 'relation' %> <p><%= f.select :relation_type, collection_for_relation_type_select, {}, :onchange => "setPredecessorFieldsVisibility();" %> -<%= l(:label_issue) %> #<%= f.text_field :issue_to_id, :size => 6 %> +<%= l(:label_issue) %> #<%= f.text_field :issue_to_id, :size => 10 %> +<div id="related_issue_candidates" class="autocomplete"></div> +<%= javascript_tag "observeRelatedIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %> <span id="predecessor_fields" style="display:none;"> <%= l(:field_delay) %>: <%= f.text_field :delay, :size => 3 %> <%= l(:label_day_plural) %> </span> |