DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed tests

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-04-17 09:26:07 +01:00
parent c604f08749
commit ab3b5ca4ef
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Company.php
View file

@ -131,7 +131,7 @@ final class Company extends SnipeModel
public static function isCurrentUserHasAccess($companyable) public static function isCurrentUserHasAccess($companyable)
{ {
// When would this even happen tho?? // When would this even happen tho??
if (is_null($companyable)) { if (!$companyable) {
return false; return false;
} }

10
app/Policies/SnipePermissionsPolicy.php
View file

@ -52,6 +52,16 @@ abstract class SnipePermissionsPolicy
return true; return true;
} }
/**
* If we got here by $this→authorize('something', $actualModel) then we can continue on Il but if we got here
* via $this→authorize('something', Model::class) then calling Company:: isCurrentUserHasAccess($item) gets weird.
* Bail out here by returning "nothing" and allow the relevant method lower in this class to be called and handle authorization.
*/
if (!$item instanceof Model){
return;
}
/** /**
* The Company::isCurrentUserHasAccess() method from the company model handles the check for FMCS already so we * The Company::isCurrentUserHasAccess() method from the company model handles the check for FMCS already so we
* don't have to do that here. * don't have to do that here.