From 84703a3e0174a646fb5d98c064e10d24e0ab5628 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 18 Mar 2016 16:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=EF=BC=8C=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E4=BD=BF=E7=94=A8https://www=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb        | 4 ++++
 app/helpers/org_member_helper.rb         | 2 +-
 app/views/organizations/setting.html.erb | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3a5cdb1a1..0c2b14277 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3044,3 +3044,7 @@ def is_default_field? field
   (field.name == 'activity' || field.name == 'course' || field.name == 'project') && field.field_type == 'default'
 end
 
+def host_with_protocol
+  return Setting.protocol + "://" + Setting.host_name
+end
+
diff --git a/app/helpers/org_member_helper.rb b/app/helpers/org_member_helper.rb
index fd70a0516..e16051eaf 100644
--- a/app/helpers/org_member_helper.rb
+++ b/app/helpers/org_member_helper.rb
@@ -9,7 +9,7 @@ module OrgMemberHelper
     principals = paginateHelper scope,10
     s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
     links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
-      link_to text, org_member_autocomplete_org_member_index_path(parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js')), :remote => true
+      link_to text,  host_with_protocol + "/org_member/org_member_autocomplete?" + parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js').to_query, :remote => true
     }
     s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
   end
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 3ef5d547c..af06c4c22 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -96,7 +96,7 @@
             <p class="fontBlue fb mb5">添加成员</p>
             <%= 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" />
-                <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %>
+                <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <div id="principals_for_new_member">
                   <%= find_user_not_in_current_org_by_name(@project) %>
                 </div>