diff options
| author | Jannik Schönartz | 2016-11-17 18:31:08 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2016-11-17 18:31:08 +0100 |
| commit | e59f7cbe8625baa1a1c162fdfb32d349e55e3453 (patch) | |
| tree | 6bb57d23880aaa76c6737e90e0ab44555642de32 /modules-available | |
| parent | First functions added to the locationinfo AdminPanel. Api is can now return t... (diff) | |
| parent | [roomplanner] baseconfig hook: Add variable for hybrid mode (diff) | |
| download | slx-admin-e59f7cbe8625baa1a1c162fdfb32d349e55e3453.tar.gz slx-admin-e59f7cbe8625baa1a1c162fdfb32d349e55e3453.tar.xz slx-admin-e59f7cbe8625baa1a1c162fdfb32d349e55e3453.zip | |
Merge branch 'location-info-panel' of git.openslx.org:openslx-ng/slx-admin into location-info-panel
Diffstat (limited to 'modules-available')
4 files changed, 30 insertions, 3 deletions
diff --git a/modules-available/roomplanner/baseconfig/getconfig.inc.php b/modules-available/roomplanner/baseconfig/getconfig.inc.php index 76cd399d..8518f751 100644 --- a/modules-available/roomplanner/baseconfig/getconfig.inc.php +++ b/modules-available/roomplanner/baseconfig/getconfig.inc.php @@ -3,6 +3,10 @@ $configVars["SLX_PVS_CONFIG_URL"] = 'http://' . $_SERVER['SERVER_ADDR'] . $_SERVER['SCRIPT_NAME'] . '?do=roomplanner'; $res = Database::queryFirst('SELECT dedicatedmgr FROM location_roomplan WHERE managerip = :ip LIMIT 1', ['ip' => $ip]); -if ($res !== false && (int)$res['dedicatedmgr'] !== 0) { - $configVars["SLX_PVS_DEDICATED"] = 'yes'; +if ($res !== false) { + if ((int)$res['dedicatedmgr'] !== 0) { + $configVars["SLX_PVS_DEDICATED"] = 'yes'; + } else { + $configVars["SLX_PVS_HYBRID"] = 'yes'; + } }
\ No newline at end of file diff --git a/modules-available/statistics/inc/filterset.inc.php b/modules-available/statistics/inc/filterset.inc.php index 9676732a..c73feeef 100644 --- a/modules-available/statistics/inc/filterset.inc.php +++ b/modules-available/statistics/inc/filterset.inc.php @@ -52,6 +52,16 @@ class FilterSet $sort = " ORDER BY " . $concreteCol . " " . $this->sortDirection . ", machineuuid ASC"; } + + public function isNoId44Filter() + { + foreach ($this->filters as $filter) { + if (get_class($filter) === 'Id44Filter' && $filter->argument == 0) { + return true; + } + } + return false; + } public function getSortDirection() { diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index 512f7ead..cf33c8af 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -500,8 +500,13 @@ class Page_Statistics extends Page { $filterSet->makeFragments($where, $join, $sort, $args); + $xtra = ''; + if ($filterSet->isNoId44Filter()) { + $xtra = ', data'; + } $res = Database::simpleQuery('SELECT machineuuid, macaddr, clientip, firstseen, lastseen,' - . ' logintime, lastboot, realcores, mbram, kvmstate, cpumodel, id44mb, hostname, notes IS NOT NULL AS hasnotes, badsectors FROM machine' + . ' logintime, lastboot, realcores, mbram, kvmstate, cpumodel, id44mb, hostname, notes IS NOT NULL AS hasnotes,' + . ' badsectors ' . $xtra . ' FROM machine' . " $join WHERE $where $sort", $args); $rows = array(); $NOW = time(); @@ -529,6 +534,11 @@ class Page_Statistics extends Page if (empty($row['hostname'])) { $row['hostname'] = $row['clientip']; } + if (isset($row['data'])) { + if (!preg_match('/^Disk.*bytes$/m', $row['data'])) { + $row['nohdd'] = true; + } + } $rows[] = $row; } Render::addTemplate('clientlist', array( diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index 2bac29fa..73148eb8 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -82,6 +82,9 @@ <span class="glyphicon glyphicon-exclamation-sign"></span> {{badsectors}} </div>{{/badsectors}} + {{#nohdd}}<div> + <span class="glyphicon glyphicon-hdd red"></span> + </div>{{/nohdd}} </td> <td>{{lang_realCores}}: {{realcores}}<div class="small">{{cpumodel}}</div></td> </tr> |