Browse Source

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

tags/v1
Jasder 6 years ago
parent
commit
e462ae24a2
2 changed files with 4 additions and 4 deletions
  1. +1
    -1
      app/controllers/members_controller.rb
  2. +3
    -3
      app/models/concerns/project_operable.rb

+ 1
- 1
app/controllers/members_controller.rb View File

@@ -15,7 +15,7 @@ class MembersController < ApplicationController
end

def index
scope = @project.members.includes(:roles, user: :user_extension)
scope = @project.except_owner_members.includes(:roles, user: :user_extension)
@total_count = scope.size
@members = paginate(scope)
end


+ 3
- 3
app/models/concerns/project_operable.rb View File

@@ -2,9 +2,9 @@ module ProjectOperable
extend ActiveSupport::Concern

included do
has_many :members
# has_many :except_owner_members, -> { members.where("members.use_id != ? ", self.owner.id ) }
has_many :manager_members, -> { joins(:roles).where(roles: { name: 'Manager' }) }, class_name: 'Member'
has_many :members, dependent: :destroy
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'
end

def add_member!(user_id, role_name='Developer')


Loading…
Cancel
Save