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

fixed bug with contact and authed user clash (#3685)

Browse Source 
If a contact key is set and a user is also logged in. this was causing the account id to be set to that of the contact, not the authed user. broke multi-account setups.
This commit is contained in:
erichester76 2020-05-18 19:53:07 -04:00 committed by GitHub
parent a8c8392f8d
commit cd2cbadd40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/EntityRequest.php
View File

@ -50,7 +50,9 @@ class EntityRequest extends Request
//Support Client Portal Scopes //Support Client Portal Scopes
$accountId = false; $accountId = false;
if(Input::get('account_id')) if($this->user()->account_id)
$accountId = $this->user()->account_id;
elseif(Input::get('account_id'))
$accountId = Input::get('account_id'); $accountId = Input::get('account_id');
elseif($contact = Contact::getContactIfLoggedIn()) elseif($contact = Contact::getContactIfLoggedIn())
$accountId = $contact->account->id; $accountId = $contact->account->id;