floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX 项目成员列表api去除项目拥有者信息

This commit is contained in:
Jasder 2020-03-25 22:32:49 +08:00
parent b709949e79
commit e462ae24a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/members_controller.rb
View File

@ -15,7 +15,7 @@ class MembersController < ApplicationController
end end
def index def index
scope = @project.members.includes(:roles, user: :user_extension) scope = @project.except_owner_members.includes(:roles, user: :user_extension)
@total_count = scope.size @total_count = scope.size
@members = paginate(scope) @members = paginate(scope)
end end

6
app/models/concerns/project_operable.rb
View File

@ -2,9 +2,9 @@ module ProjectOperable
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do included do
has_many :members has_many :members, dependent: :destroy
# has_many :except_owner_members, -> { members.where("members.use_id != ? ", self.owner.id ) } has_many :except_owner_members, -> { joins(:roles).where.not(roles: { name: 'Manager' }) }, class_name: 'Member'
has_many :manager_members, -> { joins(:roles).where(roles: { name: 'Manager' }) }, class_name: 'Member' has_many :manager_members, -> { joins(:roles).where(roles: { name: 'Manager' }) }, class_name: 'Member'
end end
def add_member!(user_id, role_name='Developer') def add_member!(user_id, role_name='Developer')