MAPG-231 introduce unlisted maps

This commit is contained in:
bence committed 2022-05-26 14:23:08 +02:00
1 parent 4f45e213c3
commit d02aa4abe0
8 files changed
+39 -4

No files matched your search

+8 -2
View File
@@ -30,12 +30,19 @@ class MapsController
['maps', 'bound_north_lat'],
['maps', 'bound_east_lng'],
['maps', 'area'],
['maps', 'unlisted'],
new RawExpression('COUNT(places.id) AS num_places')
]);
$select->leftJoin('places', ['places', 'map_id'], '=', ['maps', 'id']);
$select->groupBy(['maps', 'id']);
$select->orderBy('name');
$user = $this->request->user();
$isAdmin = $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN);
if (!$isAdmin) {
$select->where(['maps', 'unlisted'], '=', false);
}
$result = $select->execute();
$maps = [];
@@ -45,11 +52,10 @@ class MapsController
$maps[] = $map;
}
$user = $this->request->user();
return new HtmlContent('maps', [
'maps' => $maps,
'isLoggedIn' => $user !== null,
'isAdmin' => $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN)
'isAdmin' => $isAdmin
]);
}