mirror of
https://gitlink.org.cn/Gitlink/forgeplus.git
synced 2026-05-03 03:40:49 +08:00
fixed 用户删除优化处理,多个owner时,仅将用户从组织移除, 一个时直接删除
This commit is contained in:
@@ -41,7 +41,7 @@ class Admins::UsersController < Admins::BaseController
|
||||
end
|
||||
end
|
||||
@user.destroy!
|
||||
Gitea::User::DeleteService.call(@user.login)
|
||||
Gitea::User::DeleteService.call(@user.login, true)
|
||||
|
||||
render_delete_success
|
||||
end
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
class Gitea::User::DeleteService < Gitea::ClientService
|
||||
attr_reader :username
|
||||
attr_reader :username, purge
|
||||
|
||||
def initialize(username)
|
||||
def initialize(username, purge = false)
|
||||
@username = username
|
||||
@purge = purge
|
||||
end
|
||||
|
||||
def call
|
||||
response = delete(request_url, params.merge(data: {purge: true}))
|
||||
response = delete(request_url, params)
|
||||
|
||||
render_status(response)
|
||||
end
|
||||
@@ -20,7 +21,7 @@ class Gitea::User::DeleteService < Gitea::ClientService
|
||||
end
|
||||
|
||||
def request_url
|
||||
"/admin/users/#{username}"
|
||||
@purge ? "/admin/users/#{username}?purge=true" : "/admin/users/#{username}"
|
||||
end
|
||||
|
||||
def params
|
||||
|
||||
Reference in New Issue
Block a user