From 7239f6a641ea77af4e35f7ddcfcb58885c37abb9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 17 Apr 2015 14:21:44 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=88=86=E9=A1=B5=E7=A9=BA=E9=97=B4=E7=BF=BB=E9=A1=B5=E4=B8=8D?=
=?UTF-8?q?=E5=8F=AF=E7=94=A8=202=E3=80=81=E5=BD=93=E4=BA=94=E8=BE=93?=
=?UTF-8?q?=E5=85=A5=E6=97=B6=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=97=A0=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/members_helper.rb | 6 +++++-
app/views/projects/settings/_new_members.html.erb | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 7c0cc45d1..34c6dad15 100644
--- a/app/helpers/members_helper.rb
+++ b/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|
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 22fb70292..f2b48d341 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -96,7 +96,7 @@
- <%= render_principals_for_new_project_members(@project) %>
+ <%= render_project_members(@project) %>