From 1f7f1eff1a22a140ba86eaeed0a818a2ccd9307c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 23 Apr 2015 10:26:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=B7=BB=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E5=91=98=E8=BE=93=E5=85=A5=E7=A9=BA=E6=A0=BC=E9=94=AE=E4=BC=9A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=87=BA=E6=89=80=E6=9C=89=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/members_helper.rb | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 34c6dad15..06b154d36 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -32,7 +32,7 @@ module MembersHelper #获取项目可邀请的成员列表 def render_project_members project - if params[:q] && params[:q] != "" + if params[:q] && params[:q].lstrip.rstrip != "" scope = Principal.active.sorted.not_member_of(project).like(params[:q]) else scope = [] @@ -48,7 +48,7 @@ module MembersHelper # add by nwb # 课程可添加的成员列表 def render_principals_for_new_course_members(course) - if params[:q] && params[:q] != "" + if params[:q] && params[:q].lstrip.rstrip != "" scope = Principal.active.sorted.not_member_of_course(course).like(params[:q]) else scope = [] @@ -63,19 +63,6 @@ module MembersHelper s + content_tag('ul', links,:class => 'wlist',:id => "course_member_pagination_links") end - # 项目配置中添加成员列表 - def render_principals_for_new_project_members(project) - scope = Principal.active.sorted.not_member_of(project).like(params[:q]) - 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, appliedproject_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true - } - - s + content_tag('ul', links,:class => 'wlist',:id => "course_member_pagination_links") - end - # 新申请加入项目成员列表 def render_principals_for_applied_members_new project scope = project.applied_projects.map(&:user)