diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb index 3fe572a..1b0bffa 100644 --- a/app/controllers/auto_completes_controller.rb +++ b/app/controllers/auto_completes_controller.rb @@ -21,11 +21,15 @@ class AutoCompletesController < ApplicationController def issues @issues = [] q = (params[:q] || params[:term]).to_s.strip + status = params[:status].to_s.strip if q.present? scope = Issue.cross_project_scope(@project, params[:scope]).visible + scope = scope.open if status == 'o' + scope = scope.joins(:status).where("#{IssueStatus.table_name}.is_closed = 1") if status == 'c' if q.match(/\A#?(\d+)\z/) @issues << scope.find_by_id($1.to_i) end + @issues += scope.where("LOWER(#{Issue.table_name}.subject) LIKE LOWER(?)", "%#{q}%").order("#{Issue.table_name}.id DESC").limit(10).to_a @issues.compact! end diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 2249606..9495dbc 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -47,7 +47,7 @@
<% if @issue.safe_attribute? 'parent_issue_id' %>

<%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %>

-<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks)}')" %> +<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks, :status => @issue.closed? ? 'c' : 'o')}')" %> <% end %> <% if @issue.safe_attribute? 'start_date' %> diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb index 5360eac..a59f950 100644 --- a/test/functional/auto_completes_controller_test.rb +++ b/test/functional/auto_completes_controller_test.rb @@ -81,4 +81,18 @@ class AutoCompletesControllerTest < Redmine::ControllerTest assert_equal 13, issue['value'] assert_equal 'Bug #13: Subproject issue two', issue['label'] end + + def test_auto_complete_with_status_o_should_return_open_issues_only + get :issues, :project_id => 'ecookbook', :q => 'issue', :status => 'o' + assert_response :success + assert_include "Issue due today", response.body + assert_not_include "closed", response.body + end + + def test_auto_complete_with_status_c_should_return_closed_issues_only + get :issues, :project_id => 'ecookbook', :q => 'issue', :status => 'c' + assert_response :success + assert_include "closed", response.body + assert_not_include "Issue due today", response.body + end end