summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2020-04-22 18:57:32 +0200
committerSimon Rettberg2020-04-22 18:57:32 +0200
commit1e32dfc3816986ba78653bb96b344044e9a4116e (patch)
tree77b2cfa243b596c5ea289fa84f91b62552bce883
parent[rebootcontrol] Add button to subnet list to show all matching clients (diff)
downloadslx-admin-1e32dfc3816986ba78653bb96b344044e9a4116e.tar.gz
slx-admin-1e32dfc3816986ba78653bb96b344044e9a4116e.tar.xz
slx-admin-1e32dfc3816986ba78653bb96b344044e9a4116e.zip
[statistics] Fix subnet filter link in client list
-rw-r--r--modules-available/rebootcontrol/templates/subnet-list.html2
-rw-r--r--modules-available/statistics/pages/list.inc.php2
-rw-r--r--modules-available/statistics/templates/clientlist.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/modules-available/rebootcontrol/templates/subnet-list.html b/modules-available/rebootcontrol/templates/subnet-list.html
index 6df0c4f6..8ecf66b4 100644
--- a/modules-available/rebootcontrol/templates/subnet-list.html
+++ b/modules-available/rebootcontrol/templates/subnet-list.html
@@ -23,7 +23,7 @@
<div style="display: inline-block; min-width: 10em">
<a href="?do=rebootcontrol&amp;show=subnet&amp;what=subnet&amp;id={{subnetid}}">{{cidr}}</a>
</div>
- <a href="?do=statistics&amp;show=list&amp;filters=clientip%20=%20{{cidr}}" class="btn btn-default btn-xs">
+ <a href="?do=statistics&amp;show=list&amp;filters=clientip={{cidr}}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
</td>
diff --git a/modules-available/statistics/pages/list.inc.php b/modules-available/statistics/pages/list.inc.php
index 7b8e8f5f..cb938d03 100644
--- a/modules-available/statistics/pages/list.inc.php
+++ b/modules-available/statistics/pages/list.inc.php
@@ -76,7 +76,7 @@ class SubPage
$row['gbtmp'] = round($row['id44mb'] / 1024);
$octets = explode('.', $row['clientip']);
if (count($octets) === 4) {
- $row['subnet'] = "$octets[0].$octets[1].$octets[2].";
+ $row['subnet'] = "$octets[0].$octets[1].$octets[2]";
$row['lastoctet'] = $octets[3];
}
$row['ramclass'] = StatisticsStyling::ramColorClass($row['mbram']);
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html
index e9d0aeca..3d49a770 100644
--- a/modules-available/statistics/templates/clientlist.html
+++ b/modules-available/statistics/templates/clientlist.html
@@ -110,7 +110,7 @@
{{/currentuser}}
</td>
<td data-sort-value="{{clientip}}">
- <b><a href="?do=Statistics&amp;show=list&amp;filters=subnet={{subnet}}">{{subnet}}</a>{{lastoctet}}</b>
+ <b><a href="?do=Statistics&amp;show=list&amp;filters=clientip={{subnet}}/24">{{subnet}}.</a>{{lastoctet}}</b>
<div class="mac text-nowrap">{{macaddr}}</div>
<div class="hidden ip">{{clientip}}</div>
</td>