Browse Source

fix

tags/v3.0.3
vilet.yy 5 years ago
parent
commit
220ca96669
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/controllers/users/applied_transfer_projects_controller.rb

+ 2
- 2
app/controllers/users/applied_transfer_projects_controller.rb View File

@@ -4,10 +4,10 @@ class Users::AppliedTransferProjectsController < Users::BaseController
before_action :find_project, except: [:index]

def index
user_collection_sql = AppliedTransferProject.joins(project: [members: :roles]).where(members: {user_id: @_observed_user.id}, roles: {name: 'Manager'}).to_sql
user_collection_sql = AppliedTransferProject.where(owner_id: @_observed_user.id).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 = paginate @applied_transfer_projects.order("created_at desc")
@applied_transfer_projects = paginate @applied_transfer_projects
end

# 接受迁移


Loading…
Cancel
Save