From e462ae24a2872270a5ff4bc9d32bdade82ec3ce1 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Wed, 25 Mar 2020 22:32:49 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8api=E5=8E=BB=E9=99=A4=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8B=A5=E6=9C=89=E8=80=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/members_controller.rb | 2 +- app/models/concerns/project_operable.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index c7d584eb..0a31db81 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -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 diff --git a/app/models/concerns/project_operable.rb b/app/models/concerns/project_operable.rb index 4307ae54..513eff3a 100644 --- a/app/models/concerns/project_operable.rb +++ b/app/models/concerns/project_operable.rb @@ -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')