diff options
| author | Simon Rettberg | 2019-11-08 17:32:46 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-11-08 17:32:46 +0100 |
| commit | d07c0d34644fcffaee889bd9ccdaaa03919d17a5 (patch) | |
| tree | 4ad50d58a3aee817f22adb38d1c31ec96357e08b | |
| parent | [statistics] Modularize (diff) | |
| download | slx-admin-d07c0d34644fcffaee889bd9ccdaaa03919d17a5.tar.gz slx-admin-d07c0d34644fcffaee889bd9ccdaaa03919d17a5.tar.xz slx-admin-d07c0d34644fcffaee889bd9ccdaaa03919d17a5.zip | |
[statistics] Tag clients with overridden config.vars in list view
5 files changed, 20 insertions, 6 deletions
diff --git a/modules-available/statistics/lang/de/template-tags.json b/modules-available/statistics/lang/de/template-tags.json index 49e5b998..277ac651 100644 --- a/modules-available/statistics/lang/de/template-tags.json +++ b/modules-available/statistics/lang/de/template-tags.json @@ -23,6 +23,7 @@ "lang_free": "frei", "lang_gbRam": "RAM", "lang_hardwareSummary": "Hardware", + "lang_hasNotes": "Zu diesem Rechner wurden Notizen hinterlegt", "lang_hdds": "Festplatten", "lang_hostname": "Hostname", "lang_inUseMachines": "In Verwendung", @@ -62,6 +63,7 @@ "lang_noEdid": "Kein EDID", "lang_noProjectorsDefined": "Keine Beamer-Overrides definiert", "lang_notes": "Anmerkungen", + "lang_numConfigVars": "Anzahl \u00fcberschriebener Konfigurationsvariablen", "lang_onlineMachines": "Gestartete Clients", "lang_partName": "Name", "lang_partSize": "Gr\u00f6\u00dfe", diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json index c2fb194e..781bceb1 100644 --- a/modules-available/statistics/lang/en/template-tags.json +++ b/modules-available/statistics/lang/en/template-tags.json @@ -23,6 +23,7 @@ "lang_free": "free", "lang_gbRam": "RAM", "lang_hardwareSummary": "Hardware", + "lang_hasNotes": "Notes have been added to this client", "lang_hdds": "Hard disk drives", "lang_hostname": "Hostname", "lang_inUseMachines": "In use", @@ -62,6 +63,7 @@ "lang_noEdid": "No EDID", "lang_noProjectorsDefined": "No projector overrides defined", "lang_notes": "Notes", + "lang_numConfigVars": "Number of configuration variables overridden for this client", "lang_onlineMachines": "Online clients", "lang_partName": "Name", "lang_partSize": "Size", diff --git a/modules-available/statistics/pages/list.inc.php b/modules-available/statistics/pages/list.inc.php index d4f97d6e..d1c9f2e9 100644 --- a/modules-available/statistics/pages/list.inc.php +++ b/modules-available/statistics/pages/list.inc.php @@ -45,10 +45,11 @@ class SubPage $join .= ' LEFT JOIN runmode USING (machineuuid) '; } } - $res = Database::simpleQuery('SELECT machineuuid, locationid, macaddr, clientip, lastseen,' - . ' logintime, state, realcores, mbram, kvmstate, cpumodel, id44mb, hostname, notes IS NOT NULL AS hasnotes,' - . ' badsectors ' . $xtra . ' FROM machine' - . " $join WHERE $where $sort", $args); + $res = Database::simpleQuery("SELECT m.machineuuid, m.locationid, m.macaddr, m.clientip, m.lastseen, + m.logintime, m.state, m.realcores, m.mbram, m.kvmstate, m.cpumodel, m.id44mb, m.hostname, m.notes IS NOT NULL AS hasnotes, + m.badsectors, Count(s.machineuuid) AS confvars $xtra FROM machine m + LEFT JOIN setting_machine s USING (machineuuid) + $join WHERE $where GROUP BY m.machineuuid $sort", $args); $rows = array(); $singleMachine = 'none'; // TODO: Cannot disable checkbox for those where user has no permission, since we got multiple actions now diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index 8e0a24f3..5420d65c 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -65,9 +65,18 @@ <input type="checkbox" name="uuid[]" value="{{machineuuid}}" class="machine-checkbox"> <label></label> </div> + <span class="pull-right"> {{#hasnotes}} - <span class="glyphicon glyphicon-exclamation-sign pull-right"></span> + <a href="?do=Statistics&uuid={{machineuuid}}#usernotes" class="badge" title="{{lang_hasNotes}}"> + <span class="glyphicon glyphicon-tags"></span> + </a> {{/hasnotes}} + {{#confvars}} + <a href="?do=baseconfig&module=statistics&machineuuid={{machineuuid}}" class="badge" title="{{lang_numConfigVars}}"> + <span class="glyphicon glyphicon-pencil"></span>{{confvars}} + </a> + {{/confvars}} + </span> {{#state_OFFLINE}} <span class="glyphicon glyphicon-off" title="{{lang_machineOff}}"></span> {{/state_OFFLINE}} diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index 66887499..8c5668f2 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -1,6 +1,6 @@ <h1> {{hostname}} {{#hostname}}–{{/hostname}} {{clientip}} - {{#notes}}<a href="#usernotes"><span class="glyphicon glyphicon-exclamation-sign"></span></a>{{/notes}} + {{#notes}}<a href="#usernotes"><span class="glyphicon glyphicon-tags"></span></a>{{/notes}} </h1> <ol class="breadcrumb"> {{#locations}} |