direct-online/vito
2
0
Fork 0
mirror of https://github.com/vitodeploy/vito.git synced 2025-07-01 14:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix new user bug (#197)

Browse Source
This commit is contained in:
Saeed Vaziry
2024-05-09 00:55:52 +02:00
committed by GitHub
parent 179aefefac
commit 016886f307
9 changed files with 219 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,8 @@ class ProjectController extends Controller
{
public function index(): View
{
$this->authorize('viewAny', Project::class);
return view('settings.projects.index', [
'projects' => Project::all(),
]);
@ -26,6 +28,8 @@ public function index(): View
public function create(Request $request): HtmxResponse
{
$this->authorize('create', Project::class);
app(CreateProject::class)->create($request->user(), $request->input());
Toast::success('Project created.');
@ -35,8 +39,7 @@ public function create(Request $request): HtmxResponse
public function update(Request $request, Project $project): HtmxResponse
{
/** @var Project $project */
$project = $request->user()->projects()->findOrFail($project->id);
$this->authorize('update', $project);
app(UpdateProject::class)->update($project, $request->input());
@ -47,6 +50,8 @@ public function update(Request $request, Project $project): HtmxResponse
public function delete(Project $project): RedirectResponse
{
$this->authorize('delete', $project);
/** @var User $user */
$user = auth()->user();

13
app/Http/Controllers/Settings/UserController.php
View File

@ -7,6 +7,7 @@
use App\Facades\Toast;
use App\Helpers\HtmxResponse;
use App\Http\Controllers\Controller;
use App\Models\Project;
use App\Models\User;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
@ -56,6 +57,18 @@ public function updateProjects(User $user, Request $request): HtmxResponse
$user->projects()->sync($request->projects);
if ($user->currentProject && ! $user->projects->contains($user->currentProject)) {
$user->current_project_id = null;
$user->save();
}
/** @var Project $firstProject */
$firstProject = $user->projects->first();
if (! $user->currentProject && $firstProject) {
$user->current_project_id = $firstProject->id;
$user->save();
}
Toast::success('Projects updated successfully');
return htmx()->redirect(route('settings.users.show', $user));