DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Let superadmins through companyable trait

Browse source
This commit is contained in:
snipe 2016-06-10 04:07:27 -07:00
parent 02a9394cd9
commit a0901247a3
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/AssetsController.php
View file

@ -255,8 +255,9 @@ class AssetsController extends Controller
*/ */
public function getEdit($assetId = null) public function getEdit($assetId = null)
{ {
// Check if the asset exists // Check if the asset exists
if (is_null($asset = Asset::find($assetId))) { if (!$asset = Asset::find($assetId)) {
// Redirect to the asset management page // Redirect to the asset management page
return redirect()->to('hardware')->with('error', trans('admin/hardware/message.does_not_exist')); return redirect()->to('hardware')->with('error', trans('admin/hardware/message.does_not_exist'));
} elseif (!Company::isCurrentUserHasAccess($asset)) { } elseif (!Company::isCurrentUserHasAccess($asset)) {

6
app/Models/Company.php
View file

@ -102,14 +102,14 @@ final class Company extends Model
} else { } else {
$current_user_company_id = Auth::user()->company_id; $current_user_company_id = Auth::user()->company_id;
$companyable_company_id = $companyable->company_id; $companyable_company_id = $companyable->company_id;
return ($current_user_company_id == null || $current_user_company_id == $companyable_company_id || Auth::user()->isSuperUser());
return ($current_user_company_id == null || $current_user_company_id == $companyable_company_id);
} }
} }
public static function isCurrentUserAuthorized() public static function isCurrentUserAuthorized()
{ {
return (!static::isFullMultipleCompanySupportEnabled() || (Auth::user()->company_id == null) || Auth::user()->isSuperUser());
return ((!static::isFullMultipleCompanySupportEnabled()) || (Auth::user()->company_id == null) || (Auth::user()->isSuperUser()));
} }
public static function canManageUsersCompanies() public static function canManageUsersCompanies()