Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct redirects for the AP

Browse Source
This commit is contained in:
David Bomba 2023-06-04 16:46:59 +10:00
parent 0afbb1947e
commit 6a59102a90
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Traits/VerifiesUserEmail.php
View File

@ -84,6 +84,7 @@ trait VerifiesUserEmail
return $this->render('auth.confirmed', [ return $this->render('auth.confirmed', [
'root' => 'themes', 'root' => 'themes',
'message' => ctrans('texts.security_confirmation'), 'message' => ctrans('texts.security_confirmation'),
'redirect_url' => request()->hasHeader('X-React') ? 'https://app.invoicing.co/#/' : url('/'),
]); ]);
} }
} }

14
app/Http/Controllers/UserController.php
View File

@ -231,8 +231,11 @@ class UserController extends BaseController
$return_user_collection = collect(); $return_user_collection = collect();
$users->each(function ($user, $key) use ($action, $return_user_collection) { /** @var \App\Models\User $logged_in_user */
if (auth()->user()->can('edit', $user)) { $logged_in_user = auth()->user();
$users->each(function ($user, $key) use ($logged_in_user, $action, $return_user_collection) {
if ($logged_in_user->can('edit', $user)) {
$this->user_repo->{$action}($user); $this->user_repo->{$action}($user);
$return_user_collection->push($user->id); $return_user_collection->push($user->id);
@ -251,12 +254,11 @@ class UserController extends BaseController
*/ */
public function detach(DetachCompanyUserRequest $request, User $user) public function detach(DetachCompanyUserRequest $request, User $user)
{ {
// if ($request->entityIsDeleted($user)) { /** @var \App\Models\User $logged_in_user */
// return $request->disallowUpdate(); $logged_in_user = auth()->user();
// }
$company_user = CompanyUser::whereUserId($user->id) $company_user = CompanyUser::whereUserId($user->id)
->whereCompanyId(auth()->user()->companyId()) ->whereCompanyId($logged_in_user->companyId())
->withTrashed() ->withTrashed()
->first(); ->first();

2
resources/views/themes/ninja2020/auth/confirmed.blade.php
View File

@ -8,7 +8,7 @@
<img src="{{ asset('images/invoiceninja-black-logo-2.png') }}" class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo"> <img src="{{ asset('images/invoiceninja-black-logo-2.png') }}" class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo">
<h1 class="text-center text-3xl mt-10">{{ ctrans('texts.confirmation') }}</h1> <h1 class="text-center text-3xl mt-10">{{ ctrans('texts.confirmation') }}</h1>
<p class="text-center opacity-75">{{ $message }}</p> <p class="text-center opacity-75">{{ $message }}</p>
<a class="button button-primary text-blue-600 text-center mt-8" href="{{ url('/') }}">{{ ctrans('texts.return_to_login') }}</a> <a class="button button-primary text-blue-600 text-center mt-8" href="{{ $redirect_url }}">{{ ctrans('texts.return_to_login') }}</a>
</div> </div>
</div> </div>
</div> </div>