From 3b5894894fcd74347f43c51fe0d2e209c7e0e897 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 25 Sep 2024 14:01:37 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86,=E5=A4=9A=E4=B8=AAowner?= =?UTF-8?q?=E6=97=B6,=E4=BB=85=E5=B0=86=E7=94=A8=E6=88=B7=E4=BB=8E?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=A7=BB=E9=99=A4,=20=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=97=B6=E7=9B=B4=E6=8E=A5=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admins/users_controller.rb | 2 +- app/services/gitea/user/delete_service.rb | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/admins/users_controller.rb b/app/controllers/admins/users_controller.rb index ba7b70d29..f5974b47d 100644 --- a/app/controllers/admins/users_controller.rb +++ b/app/controllers/admins/users_controller.rb @@ -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 diff --git a/app/services/gitea/user/delete_service.rb b/app/services/gitea/user/delete_service.rb index 763c6047f..096a88251 100644 --- a/app/services/gitea/user/delete_service.rb +++ b/app/services/gitea/user/delete_service.rb @@ -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