summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-09-09 12:23:15 +0200
committerSimon Rettberg2016-09-09 12:23:15 +0200
commit96bdcf395892a31ce28cacbf708dc111a8b0f471 (patch)
treeba195c8749fa5615589ba60501f994013a66cb60
parent[statistics] Fix pressing return in "add filter" dialog (diff)
downloadslx-admin-96bdcf395892a31ce28cacbf708dc111a8b0f471.tar.gz
slx-admin-96bdcf395892a31ce28cacbf708dc111a8b0f471.tar.xz
slx-admin-96bdcf395892a31ce28cacbf708dc111a8b0f471.zip
[statistics] Fix currentuser filter
-rw-r--r--modules-available/statistics/lang/de/template-tags.json1
-rw-r--r--modules-available/statistics/lang/en/template-tags.json1
-rw-r--r--modules-available/statistics/page.inc.php2
-rw-r--r--modules-available/statistics/templates/filterbox.html3
4 files changed, 5 insertions, 2 deletions
diff --git a/modules-available/statistics/lang/de/template-tags.json b/modules-available/statistics/lang/de/template-tags.json
index 1c893e2a..ca6c56a7 100644
--- a/modules-available/statistics/lang/de/template-tags.json
+++ b/modules-available/statistics/lang/de/template-tags.json
@@ -7,6 +7,7 @@
"lang_cores": "Kerne",
"lang_cpuCores": "CPU-Kerne",
"lang_cpuModel": "CPU",
+ "lang_currentUser": "Aktueller\/Letzter Benutzer",
"lang_details": "Details",
"lang_devices": "Ger\u00e4te",
"lang_duration": "Dauer",
diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json
index e11073ae..55003ea9 100644
--- a/modules-available/statistics/lang/en/template-tags.json
+++ b/modules-available/statistics/lang/en/template-tags.json
@@ -7,6 +7,7 @@
"lang_cores": "Cores",
"lang_cpuCores": "CPU cores",
"lang_cpuModel": "CPU",
+ "lang_currentUser": "Current\/last user",
"lang_details": "Details",
"lang_devices": "Devices",
"lang_duration": "Duration",
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php
index 43b3a6e8..a6ac8037 100644
--- a/modules-available/statistics/page.inc.php
+++ b/modules-available/statistics/page.inc.php
@@ -105,7 +105,7 @@ class Page_Statistics extends Page
'currentuser' => [
'op' => Page_Statistics::$op_nominal,
'type' => 'string',
- 'column' => false
+ 'column' => true
]
];
if (Module::isAvailable('locations')) {
diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html
index fca7bdea..95fbab84 100644
--- a/modules-available/statistics/templates/filterbox.html
+++ b/modules-available/statistics/templates/filterbox.html
@@ -74,7 +74,8 @@ var slxFilterNames = {
badsectors: '{{lang_reallocatedSectors}}',
clientip: '{{lang_ip}}',
state: '{{lang_usageState}}',
- location: '{{lang_location}}'
+ location: '{{lang_location}}',
+ currentuser: '{{lang_currentUser}}'
};
slxLocations = {{{locations}}};