jro_apps/redmine Commit - r4388:a8b12bcb5202

Autocomplete issue relations on subject (#3170)....

Jean-Philippe Lang -

r4388:a8b12bcb5202

parent child

Context file:

r4388:a8b12bcb5202

app/controllers/auto_completes_controller.rb +3 -2

               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

app/views/issue_relations/_form.rhtml +3 -1

             <%= 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>

public/javascripts/application.js +14 0

@@ -218,6 +218,20 function observeParentIssueField(url) {
218	}});	218	}});
219	}	219	}
220		220
		221	function observeRelatedIssueField(url) {
		222	new Ajax.Autocompleter('relation_issue_to_id',
		223	'related_issue_candidates',
		224	url,
		225	{ minChars: 3,
		226	frequency: 0.5,
		227	paramName: 'q',
		228	updateElement: function(value) {
		229	document.getElementById('relation_issue_to_id').value = value.id;
		230	},
		231	parameters: 'scope=all'
		232	});
		233	}
		234
221	/* shows and hides ajax indicator */	235	/* shows and hides ajax indicator */
222	Ajax.Responders.register({	236	Ajax.Responders.register({
223	onCreate: function(){	237	onCreate: function(){

public/stylesheets/application.css +1 0

             }
             #parent_issue_candidates ul li {width: 500px;}
+            #related_issue_candidates ul li {width: 500px;}
             /***** Diff *****/
             .diff_out { background: #fcc; }

test/functional/auto_completes_controller_test.rb +14 0

@@ -17,4 +17,18 class AutoCompletesControllerTest < ActionController::TestCase
17	assert assigns(:issues).include?(Issue.find(13))	17	assert assigns(:issues).include?(Issue.find(13))
18	end	18	end
19		19
		20	def test_auto_complete_with_scope_all_and_cross_project_relations
		21	Setting.cross_project_issue_relations = '1'
		22	get :issues, :project_id => 'ecookbook', :q => '13', :scope => 'all'
		23	assert_response :success
		24	assert_not_nil assigns(:issues)
		25	assert assigns(:issues).include?(Issue.find(13))
		26	end
		27
		28	def test_auto_complete_with_scope_all_without_cross_project_relations
		29	Setting.cross_project_issue_relations = '0'
		30	get :issues, :project_id => 'ecookbook', :q => '13', :scope => 'all'
		31	assert_response :success
		32	assert_equal [nil], assigns(:issues)
		33	end
20	end	34	end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages