banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-19 17:34:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix database & user not being deleted (#1315)

Browse Source
This commit is contained in:
Boy132 2025-04-29 17:05:49 +02:00 committed by GitHub
parent 92c23451af
commit 14d351103c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filament/Server/Resources/DatabaseResource/Pages/ListDatabases.php
View File

@ -2,7 +2,6 @@
namespace App\Filament\Server\Resources\DatabaseResource\Pages; namespace App\Filament\Server\Resources\DatabaseResource\Pages;
use App\Facades\Activity;
use App\Filament\Components\Forms\Actions\RotateDatabasePasswordAction; use App\Filament\Components\Forms\Actions\RotateDatabasePasswordAction;
use App\Filament\Components\Tables\Columns\DateTimeColumn; use App\Filament\Components\Tables\Columns\DateTimeColumn;
use App\Filament\Server\Resources\DatabaseResource; use App\Filament\Server\Resources\DatabaseResource;
@ -82,12 +81,7 @@ class ListDatabases extends ListRecords
ViewAction::make() ViewAction::make()
->modalHeading(fn (Database $database) => 'Viewing ' . $database->database), ->modalHeading(fn (Database $database) => 'Viewing ' . $database->database),
DeleteAction::make() DeleteAction::make()
->after(function (Database $database) { ->using(fn (Database $database, DatabaseManagementService $service) => $service->delete($database)),
Activity::event('server:database.delete')
->subject($database)
->property('name', $database->database)
->log();
}),
]); ]);
} }

15
app/Services/Databases/DatabaseManagementService.php
View File

@ -118,11 +118,18 @@ class DatabaseManagementService
*/ */
public function delete(Database $database): ?bool public function delete(Database $database): ?bool
{ {
$database->dropDatabase($database->database); return $this->connection->transaction(function () use ($database) {
$database->dropUser($database->username, $database->remote); $database->dropDatabase($database->database);
$database->flush(); $database->dropUser($database->username, $database->remote);
$database->flush();
return $database->delete(); Activity::event('server:database.delete')
->subject($database)
->property('name', $database->database)
->log();
return $database->delete();
});
} }
/** /**