diff options
| author | Simon Rettberg | 2016-09-09 18:16:46 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-09-09 18:16:46 +0200 |
| commit | d2d7f27f58235db9ac428b9dd952e7b108f3c381 (patch) | |
| tree | 6d59083fd82fb09e2db7444af0525e78b5b5fa76 /modules-available/statistics | |
| parent | [exams] Less bla (diff) | |
| download | slx-admin-d2d7f27f58235db9ac428b9dd952e7b108f3c381.tar.gz slx-admin-d2d7f27f58235db9ac428b9dd952e7b108f3c381.tar.xz slx-admin-d2d7f27f58235db9ac428b9dd952e7b108f3c381.zip | |
[locations/statistics] Make machine counting more consistent
Diffstat (limited to 'modules-available/statistics')
| -rw-r--r-- | modules-available/statistics/inc/filter.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/statistics/page.inc.php | 1 | ||||
| -rw-r--r-- | modules-available/statistics/templates/clientlist.html | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/modules-available/statistics/inc/filter.inc.php b/modules-available/statistics/inc/filter.inc.php index 19d38140..b35075bc 100644 --- a/modules-available/statistics/inc/filter.inc.php +++ b/modules-available/statistics/inc/filter.inc.php @@ -220,7 +220,7 @@ class LocationFilter extends Filter $joins[] = ' INNER JOIN subnet ON (INET_ATON(clientip) BETWEEN startaddr AND endaddr) '; $args['lid'] = $this->argument; $neg = $this->operator == '=' ? '' : 'NOT'; - return "$neg (subnet.locationid = :lid OR machine.locationid = :lid)"; + return "$neg ((subnet.locationid = :lid AND machine.locationid IS NULL) OR machine.locationid = :lid)"; } } } diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index c8fcaa43..9383944e 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -532,6 +532,7 @@ class Page_Statistics extends Page $rows[] = $row; } Render::addTemplate('clientlist', array( + 'rowCount' => count($rows), 'rows' => $rows, 'query' => $this->query, 'delimiter' => Filter::DELIMITER, diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index ca4b971a..2bac29fa 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -1,7 +1,7 @@ -<h1>{{lang_clientList}}</h1> +<h1>{{lang_clientList}} ({{rowCount}})</h1> <table class="table table-condensed table-striped"> <tr> |