Skip to content

Apply fixes from StyleCI #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
murrant wants to merge 2 commits into from
Closed

Apply fixes from StyleCI #450

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e682bd1
Use device permission cache for map access
murrant Dec 8, 2025
01cc998
Apply fixes from StyleCI
StyleCIBot Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions app/Models/CustomMap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,23 +101,15 @@ public function hasReadAccess(User $user): bool
return true;
}

public function scopeHasAccess($query, User $user)
public function scopeHasAccess(Builder $query, User $user): Builder
{
if ($user->hasGlobalRead()) {
return $query;
}

// Allow only if the user has access to all devices on the map
return $query->withCount([
'nodes as device_nodes_count' => function (Builder $q): void {
$q->whereNotNull('device_id');
},
'nodes as device_nodes_allowed_count' => function (Builder $q) use ($user): void {
$this->hasDeviceAccess($q, $user, 'custom_map_nodes');
},
])
->havingRaw('device_nodes_count = device_nodes_allowed_count')
->having('device_nodes_count', '>', 0);
// Only show maps where ALL device nodes are accessible by the user
return $query->whereHas('nodes', fn ($q) => $q->whereNotNull('device_id'))
->whereDoesntHave('nodes', fn ($q) => $q->whereNotNull('device_id')->whereNotIn('device_id', \Permissions::devicesForUser($user)));
}

/**
Expand Down