ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9876 from Toreg87/fixes/locations-deletable

Browse Source 
Fixed #9875: Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
This commit is contained in:
snipe
2022-12-14 17:46:53 -08:00
committed by GitHub
parent c342668f0f 1a908e361e
commit 418ddcfac3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Company.php
View File

@@ -127,6 +127,11 @@ final class Company extends SnipeModel
return false;
} elseif (! static::isFullMultipleCompanySupportEnabled()) {
return true;
} elseif (!$companyable instanceof Company && !\Schema::hasColumn($companyable->getModel()->getTable(), 'company_id')) {
// This is primary for the gate:allows-check in location->isDeletable()
// Locations don't have a company_id so without this it isn't possible to delete locations with FullMultipleCompanySupport enabled
// because this function is called by SnipePermissionsPolicy->before()
return true;
} else {
if (Auth::user()) {
$current_user_company_id = Auth::user()->company_id;