From d60ba95444d84db586a41ed9e66978b770b4cdc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Thu, 12 Oct 2023 11:25:23 +0800 Subject: [PATCH] OrganizationUsers add pm_check_user --- .../organizations/organization_users_controller.rb | 7 ++++++- app/controllers/organizations/team_users_controller.rb | 4 ++-- config/routes.rb | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/organizations/organization_users_controller.rb b/app/controllers/organizations/organization_users_controller.rb index b31ca1e40..d9035dc14 100644 --- a/app/controllers/organizations/organization_users_controller.rb +++ b/app/controllers/organizations/organization_users_controller.rb @@ -1,6 +1,7 @@ class Organizations::OrganizationUsersController < Organizations::BaseController before_action :load_organization - before_action :load_operate_user, :load_organization_user, :check_user_can_edit_org, only: [:destroy] + before_action :load_operate_user, :load_organization_user, only: [:destroy, :pm_check_user] + before_action :check_user_can_edit_org, only: [:destroy] def index @organization_users = @organization.organization_users.includes(:user) @@ -16,6 +17,10 @@ class Organizations::OrganizationUsersController < Organizations::BaseController @organization_users = kaminari_paginate(@organization_users) end + def pm_check_user + render_ok + end + def destroy tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(@operate_user.id) ActiveRecord::Base.transaction do diff --git a/app/controllers/organizations/team_users_controller.rb b/app/controllers/organizations/team_users_controller.rb index b6c4ed29d..373645220 100644 --- a/app/controllers/organizations/team_users_controller.rb +++ b/app/controllers/organizations/team_users_controller.rb @@ -1,8 +1,8 @@ class Organizations::TeamUsersController < Organizations::BaseController before_action :load_organization, :load_team - before_action :load_operate_user, only: [:create, :destroy, :check_user] + before_action :load_operate_user, only: [:create, :destroy, :pm_check_user] before_action :check_user_profile_completed, only: [:create] - before_action :load_team_user, only: [:destroy, :check_user] + before_action :load_team_user, only: [:destroy, :pm_check_user] before_action :check_user_can_edit_org, only: [:create, :destroy] def index diff --git a/config/routes.rb b/config/routes.rb index 07cc9d6ed..312f267da 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -146,6 +146,7 @@ Rails.application.routes.draw do resources :organization_users, only: [:index, :destroy] do collection do delete :quit + get :pm_check_user end end resources :clas