From 86a5eccae6731968f43c80cdca011e62f3e2f726 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 24 Jun 2016 14:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=AE=BE=E7=BD=AE=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98BUG=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  8 -------
 .../org_member_autocomplete.js.erb            | 23 -------------------
 app/views/organizations/setting.html.erb      |  4 ++--
 config/routes.rb                              |  1 -
 public/javascripts/application.js             |  1 +
 5 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 app/views/organizations/org_member_autocomplete.js.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index e052ec20f..b36ef592d 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -642,12 +642,4 @@ class OrganizationsController < ApplicationController
       OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain])
     end
   end
-
-  def org_member_autocomplete
-    @org = Organization.find(params[:org])
-    @flag = params[:flag] || false
-    respond_to do |format|
-      format.js
-    end
-  end
 end
diff --git a/app/views/organizations/org_member_autocomplete.js.erb b/app/views/organizations/org_member_autocomplete.js.erb
deleted file mode 100644
index 1dbb972f8..000000000
--- a/app/views/organizations/org_member_autocomplete.js.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% if @org%>
-var checked = $("#principals_for_new_member input:checked").size();
-if(checked > 0)
-{
-    alert('翻页或搜索后将丢失当前选择的用户数据!');
-}
-<% if @flag == "true"%>
-$('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
-<% else%>
-$('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
-<% end%>
-
-<%end%>
-var collection=$("#principals_for_new_member").children("#principals").children("label");
-collection.css("text-overflow","ellipsis");
-collection.css("white-space","nowrap");
-collection.css("width","200px");
-collection.css("overflow","hidden");
-for(i=0;i<collection.length;i++){    //增加悬浮显示
-    var label=collection[i];
-    var text=$(label).text();
-    $(label).attr("title",text);
-}
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index edf00cd78..a2f8a8f29 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -112,8 +112,8 @@
             <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                 <%# if @organization.secdomain_name.nil? %>
-                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
-                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %>
+                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %>
                 <%# else %>
                     <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <%# end %>
diff --git a/config/routes.rb b/config/routes.rb
index 7008b3ab7..ec8fa2337 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,7 +104,6 @@ RedmineApp::Application.routes.draw do
       post 'agree_apply_subdomain'
       post 'update_field_by_admin'
       post 'reset_update_field_by_admin'
-      get 'org_member_autocomplete'
     end
   end
 
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 22483c1d5..a2f14332d 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -547,6 +547,7 @@ function observeSearchfield(fieldId, targetId, url) {
         $.ajax({
           url: url,
           type: 'get',
+          dataType: 'jsonp',
           data: {q: $this.val()},
           success: function(data){ if(targetId) $('#'+targetId).html(data); },
           beforeSend: function(){ $this.addClass('ajax-loading'); },