fixed 用户删除优化处理,多个owner时,仅将用户从组织移除, 一个时直接删除
This commit is contained in:
parent
e29b6181bc
commit
3b5894894f
|
@ -41,7 +41,7 @@ class Admins::UsersController < Admins::BaseController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@user.destroy!
|
@user.destroy!
|
||||||
Gitea::User::DeleteService.call(@user.login)
|
Gitea::User::DeleteService.call(@user.login, true)
|
||||||
|
|
||||||
render_delete_success
|
render_delete_success
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
class Gitea::User::DeleteService < Gitea::ClientService
|
class Gitea::User::DeleteService < Gitea::ClientService
|
||||||
attr_reader :username
|
attr_reader :username, purge
|
||||||
|
|
||||||
def initialize(username)
|
def initialize(username, purge = false)
|
||||||
@username = username
|
@username = username
|
||||||
|
@purge = purge
|
||||||
end
|
end
|
||||||
|
|
||||||
def call
|
def call
|
||||||
response = delete(request_url, params.merge(data: {purge: true}))
|
response = delete(request_url, params)
|
||||||
|
|
||||||
render_status(response)
|
render_status(response)
|
||||||
end
|
end
|
||||||
|
@ -20,7 +21,7 @@ class Gitea::User::DeleteService < Gitea::ClientService
|
||||||
end
|
end
|
||||||
|
|
||||||
def request_url
|
def request_url
|
||||||
"/admin/users/#{username}"
|
@purge ? "/admin/users/#{username}?purge=true" : "/admin/users/#{username}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def params
|
def params
|
||||||
|
|
Loading…
Reference in New Issue