forked from Gitlink/forgeplus
添加协作者的筛选和中文名称
This commit is contained in:
parent
29b8a92b9a
commit
f3de6e5fa0
|
@ -16,6 +16,11 @@ class MembersController < ApplicationController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
scope = @project.members.includes(:roles, user: :user_extension)
|
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
|
@total_count = scope.size
|
||||||
@members = paginate(scope)
|
@members = paginate(scope)
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,5 +4,6 @@ json.members @members do |member|
|
||||||
json.partial! 'member', user: member.user
|
json.partial! 'member', user: member.user
|
||||||
json.is_owner @project.owner?(member.user)
|
json.is_owner @project.owner?(member.user)
|
||||||
json.role member.roles.last.name
|
json.role member.roles.last.name
|
||||||
|
json.role_name t("roles.#{member.roles.last.name}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -222,3 +222,7 @@ zh-CN:
|
||||||
live_time: '开播时间'
|
live_time: '开播时间'
|
||||||
duration: '直播时长'
|
duration: '直播时长'
|
||||||
close_pr: 合并请求
|
close_pr: 合并请求
|
||||||
|
roles:
|
||||||
|
Developer: 开发者
|
||||||
|
Reporter: 报告者
|
||||||
|
Manager: 管理员
|
Loading…
Reference in New Issue