Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq

app/helpers/members_helper.rb

@@ -32,7 +32,11 @@ module MembersHelper
 
   #获取项目可邀请的成员列表
   def render_project_members project
-    scope = Principal.active.sorted.not_member_of(project).like(params[:q])
+    if params[:q] && params[:q] != ""
+      scope = Principal.active.sorted.not_member_of(project).like(params[:q])
+    else
+      scope = []
+    end
     principals = paginateHelper scope,10
     s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5')
     links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|

app/views/projects/settings/_new_members.html.erb

@@ -96,7 +96,7 @@
             <div class="cl"></div>
 
             <div id="principals_for_new_member">
-              <%= render_principals_for_new_project_members(@project) %>
+              <%= render_project_members(@project) %>
             </div>
             <div class="cl"></div>