direct-online/vito
2
0
Fork 0
mirror of https://github.com/vitodeploy/vito.git synced 2025-04-19 01:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix project deletion 404 error (#208)

Browse Source
This commit is contained in:
Saeed Vaziry 2024-05-15 13:41:33 +02:00 committed by GitHub
parent de468ae1ba
commit e3ea8f975f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Actions/Projects/DeleteProject.php
View File

@ -17,12 +17,16 @@ public function delete(User $user, Project $project): void
} }
if ($user->current_project_id == $project->id) { if ($user->current_project_id == $project->id) {
/** @var Project $randomProject */ throw ValidationException::withMessages([
$randomProject = $user->projects()->where('id', '!=', $project->id)->first(); 'project' => __('Cannot delete your current project.'),
$user->current_project_id = $randomProject->id; ]);
$user->save();
} }
/** @var Project $randomProject */
$randomProject = $user->projects()->where('project_id', '!=', $project->id)->first();
$user->current_project_id = $randomProject->id;
$user->save();
$project->delete(); $project->delete();
} }
} }

3
app/Http/Controllers/Settings/ProjectController.php
View File

@ -55,9 +55,6 @@ public function delete(Project $project): RedirectResponse
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Project $project */
$project = $user->projects()->findOrFail($project->id);
try { try {
app(DeleteProject::class)->delete($user, $project); app(DeleteProject::class)->delete($user, $project);
} catch (ValidationException $e) { } catch (ValidationException $e) {