From 786481e144b4e87f5270964f9174fd3057597c43 Mon Sep 17 00:00:00 2001 From: ganyiang Date: Wed, 7 May 2014 20:30:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=97=AE=E9=A2=98-=E4=B8=BB?= =?UTF-8?q?=E9=A2=98-autocomplete-=E9=80=89=E4=B8=AD=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/auto_completes_controller.rb | 1 + app/views/auto_completes/issues.html.erb | 2 +- app/views/issues/_form.html.erb | 3 ++- public/javascripts/application.js | 6 +++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb index ea463e121..9e7467bfc 100644 --- a/app/controllers/auto_completes_controller.rb +++ b/app/controllers/auto_completes_controller.rb @@ -30,6 +30,7 @@ class AutoCompletesController < ApplicationController @issues.compact! end render :layout => false + end private diff --git a/app/views/auto_completes/issues.html.erb b/app/views/auto_completes/issues.html.erb index e292bbaeb..b097eaff4 100644 --- a/app/views/auto_completes/issues.html.erb +++ b/app/views/auto_completes/issues.html.erb @@ -3,5 +3,5 @@ 'label' => "#{issue.tracker} ##{issue.id}: #{truncate issue.subject.to_s, :length => 60}", 'value' => issue.id } - }.to_json + }.to_json %> diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 0e3cee1ff..8f9554107 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -14,7 +14,8 @@ <% if @issue.safe_attribute? 'tracker_id' %>

<%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, {:required => true}, - :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %>

+ :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %>

+ <% end %> diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 3067b0f23..b85172660 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -476,12 +476,16 @@ function observeAutocompleteField(fieldId, url, options) { $(document).ready(function() { $('#'+fieldId).autocomplete($.extend({ source: url, + select: function(e,ui){location.href("/issues/"+ui.item.value);}, minLength: 2, search: function(){$('#'+fieldId).addClass('ajax-loading');}, - response: function(){$('#'+fieldId).removeClass('ajax-loading');} + response: function(){$('#'+fieldId).removeClass('ajax-loading'); + } }, options)); $('#'+fieldId).addClass('autocomplete'); + }); + } function observeSearchfield(fieldId, targetId, url) {