lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-07-28 12:51:01 -07:00
commit 0a73297f24
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Models/Company.php
View file

@ -86,12 +86,18 @@ final class Company extends Model
} else { } else {
$current_user = Auth::user(); $current_user = Auth::user();
// Super users should be able to set a company to whatever they need
if ($current_user->isSuperUser()) {
return static::getIdFromInput($unescaped_input);
} else {
if ($current_user->company_id != null) { if ($current_user->company_id != null) {
return $current_user->company_id; return $current_user->company_id;
} else { } else {
return static::getIdFromInput($unescaped_input); return static::getIdFromInput($unescaped_input);
} }
} }
}
} }
public static function isCurrentUserHasAccess($companyable) public static function isCurrentUserHasAccess($companyable)