fix
This commit is contained in:
parent
1d81548eb6
commit
28c8761f32
|
@ -4,10 +4,10 @@ class Users::AppliedTransferProjectsController < Users::BaseController
|
||||||
before_action :find_project, except: [:index]
|
before_action :find_project, except: [:index]
|
||||||
|
|
||||||
def index
|
def index
|
||||||
user_collection_sql = AppliedTransferProject.where(owner_id: @_observed_user.id).to_sql
|
user_collection_sql = AppliedTransferProject.joins(project: [members: :roles]).where(members: {user_id: @_observed_user.id}, roles: {name: 'Manager'}).to_sql
|
||||||
org_collection_sql = AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @_observed_user.id}, teams: {authorize: %w(admin owner)} )).to_sql
|
org_collection_sql = AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @_observed_user.id}, teams: {authorize: %w(admin owner)} )).to_sql
|
||||||
@applied_transfer_projects = AppliedTransferProject.from("( #{ user_collection_sql } UNION #{ org_collection_sql } ) AS applied_transfer_projects")
|
@applied_transfer_projects = AppliedTransferProject.from("( #{ user_collection_sql } UNION #{ org_collection_sql } ) AS applied_transfer_projects")
|
||||||
@applied_transfer_projects = paginate @applied_transfer_projects
|
@applied_transfer_projects = paginate @applied_transfer_projects.order("created_at desc")
|
||||||
end
|
end
|
||||||
|
|
||||||
# 接受迁移
|
# 接受迁移
|
||||||
|
|
|
@ -26,7 +26,7 @@ class Projects::AcceptTransferService < ApplicationService
|
||||||
private
|
private
|
||||||
def validate!
|
def validate!
|
||||||
raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
|
raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
|
||||||
raise Error, '未拥有接受转移权限' unless @user.admin? || @project.is_admin?(@user)
|
raise Error, '未拥有接受转移权限' unless @user.admin? || @project.manager?(@user)
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_apply
|
def update_apply
|
||||||
|
|
|
@ -21,6 +21,7 @@ class Projects::RefuseTransferService < ApplicationService
|
||||||
private
|
private
|
||||||
def validate!
|
def validate!
|
||||||
raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
|
raise Error, '该仓库未在迁移' unless @applied_transfer_project.present? && @project.is_transfering
|
||||||
|
raise Error, '未拥有拒绝转移权限' unless @user.admin? || @project.manager?(@user)
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_apply
|
def update_apply
|
||||||
|
|
Loading…
Reference in New Issue