From f3de6e5fa04cd498ea29ed210f684190f328a831 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Mon, 18 May 2020 18:37:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=8F=E4=BD=9C=E8=80=85?= =?UTF-8?q?=E7=9A=84=E7=AD=9B=E9=80=89=E5=92=8C=E4=B8=AD=E6=96=87=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/members_controller.rb | 5 +++++ app/views/members/index.json.jbuilder | 1 + config/locales/zh-CN.yml | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 3591d842d..72627fbfb 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -16,6 +16,11 @@ class MembersController < ApplicationController def index scope = @project.members.includes(:roles, user: :user_extension) + search = params[:search].to_s.downcase + role = params[:role].to_s + scope = scope.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present? + scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role.split(" ")}%") if role.present? + @total_count = scope.size @members = paginate(scope) end diff --git a/app/views/members/index.json.jbuilder b/app/views/members/index.json.jbuilder index 4629d8ec4..457c50271 100644 --- a/app/views/members/index.json.jbuilder +++ b/app/views/members/index.json.jbuilder @@ -4,5 +4,6 @@ json.members @members do |member| json.partial! 'member', user: member.user json.is_owner @project.owner?(member.user) json.role member.roles.last.name + json.role_name t("roles.#{member.roles.last.name}") end end diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index f789fc516..ab6601ed4 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -222,3 +222,7 @@ zh-CN: live_time: '开播时间' duration: '直播时长' close_pr: 合并请求 + roles: + Developer: 开发者 + Reporter: 报告者 + Manager: 管理员 \ No newline at end of file