VMware VM display changes #2684

Merged
merged 4 commits into from Jan 2, 2016

Projects

None yet

4 participants

@Rosiak
Contributor
Rosiak commented Jan 2, 2016

No description provided.

Rosiak added some commits Jan 2, 2016
@Rosiak Rosiak Small changes to Virtual Machines page b7ac493
@Rosiak Rosiak Set min-width
e3663ff
@paulgear paulgear and 1 other commented on an outdated diff Jan 2, 2016
html/pages/device/vm.inc.php
$i++;
}
echo '</table>';
-
-$pagetitle[] = 'Virtual Machines';
+$pagetitle[] = 'Virtual Machines';
@paulgear
paulgear Jan 2, 2016 Member

What editor are you using? Would be nice to get it not to mess up EOF newlines like that...

@Rosiak
Rosiak Jan 2, 2016 Contributor

Yeah sorry for that, should I re-add it again?

@paulgear
paulgear Jan 2, 2016 Member

I would prefer it, but it's not a big deal; it just adds noise to diffs is all...

@paulgear
Member
paulgear commented Jan 2, 2016

👍 from me

@Rosiak Rosiak re-add newline
e61f6cd
@f0o f0o commented on an outdated diff Jan 2, 2016
html/pages/device/vm.inc.php
$i = '1';
-foreach (dbFetchRows('SELECT * FROM vminfo WHERE device_id = ? ORDER BY vmwVmDisplayName', array($device['device_id'])) as $vm) {
+foreach (dbFetchRows('SELECT `vmwVmDisplayName`,`vmwVmState`,`vmwVmGuestOS`,`vmwVmMemSize`,`vmwVmCpus` FROM `vminfo` WHERE `device_id` = ? ORDER BY `vmwVmDisplayName', array($device['device_id'])) as $vm) {
@f0o
f0o Jan 2, 2016 Member

Missing ending

` tick

In SQL

@Rosiak Rosiak add missing backtick
1ee694f
@f0o f0o merged commit c8d3893 into librenms:master Jan 2, 2016

2 checks passed

Auto-Deploy Build finished. No test results found.
Details
Scrutinizer No new issues
Details
@Rosiak Rosiak deleted the Rosiak:vmware-vm-changes branch Feb 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment