Browse Source

添加协作者的筛选和中文名称

tags/v1
sylor_huang@126.com 6 years ago
parent
commit
f3de6e5fa0
3 changed files with 10 additions and 0 deletions
  1. +5
    -0
      app/controllers/members_controller.rb
  2. +1
    -0
      app/views/members/index.json.jbuilder
  3. +4
    -0
      config/locales/zh-CN.yml

+ 5
- 0
app/controllers/members_controller.rb View File

@@ -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


+ 1
- 0
app/views/members/index.json.jbuilder View File

@@ -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

+ 4
- 0
config/locales/zh-CN.yml View File

@@ -222,3 +222,7 @@ zh-CN:
live_time: '开播时间'
duration: '直播时长'
close_pr: 合并请求
roles:
Developer: 开发者
Reporter: 报告者
Manager: 管理员

Loading…
Cancel
Save