summaryrefslogtreecommitdiffstats
path: root/modules-available/remoteaccess/page.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2022-07-25 10:58:27 +0200
committerSimon Rettberg2022-07-25 10:58:27 +0200
commitcfd4396321b6b03c6e099ea4117d8d3d1874c6f5 (patch)
tree0999616e54364c8a043f33065fee2ea10dfe5736 /modules-available/remoteaccess/page.inc.php
parent[vmstore] Benchmark: Put server list first, add fixed buttonbar at bottom (diff)
downloadslx-admin-cfd4396321b6b03c6e099ea4117d8d3d1874c6f5.tar.gz
slx-admin-cfd4396321b6b03c6e099ea4117d8d3d1874c6f5.tar.xz
slx-admin-cfd4396321b6b03c6e099ea4117d8d3d1874c6f5.zip
[remoteaccess] Don't uncheck currently disabled locations in group edit
Diffstat (limited to 'modules-available/remoteaccess/page.inc.php')
-rw-r--r--modules-available/remoteaccess/page.inc.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules-available/remoteaccess/page.inc.php b/modules-available/remoteaccess/page.inc.php
index 05816beb..fa94e193 100644
--- a/modules-available/remoteaccess/page.inc.php
+++ b/modules-available/remoteaccess/page.inc.php
@@ -93,7 +93,8 @@ class Page_RemoteAccess extends Page
// Edit list of groups and their settings
$groups = Database::queryAll("SELECT g.groupid, g.groupname, g.wolcount, g.passwd,
Count(l.locationid) AS locs, If(g.active, 'checked', '') AS checked, unwoken
- FROM remoteaccess_group g LEFT JOIN remoteaccess_x_location l USING (groupid)
+ FROM remoteaccess_group g
+ LEFT JOIN remoteaccess_x_location l USING (groupid)
GROUP BY g.groupid, g.groupname
ORDER BY g.groupname ASC");
$data = [
@@ -109,7 +110,7 @@ class Page_RemoteAccess extends Page
// Edit locations for group
$group = $this->groupNameOrFail($groupid);
$locationList = Location::getLocationsAssoc();
- $enabled = RemoteAccess::getEnabledLocations($groupid);
+ $enabled = RemoteAccess::getEnabledLocations($groupid, false);
$allowed = User::getAllowedLocations('group.locations');
foreach ($enabled as $lid) {
if (isset($locationList[$lid])) {