nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2868 from jbwiv/master

Browse Source 
Added service description to option drop down for editing and deletin…
This commit is contained in:
Neil Lathwood
2016-01-27 18:52:22 +00:00
parent 3e97875d77 01c7a7e56c
commit 060bd55da8
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AUTHORS.md
+1
View File
@@ -82,6 +82,7 @@ LibreNMS contributors:
- Adam Winberg <adam.winberg@gmail.com> (wiad)
- Maximilian Wilhelm <max@rfc2324.org> (BarbarossaTM)
- Jameson Finney <jameson.finney@gmail.com> (JamesonFinney)
- John Wells <john.wells@greatworx.com> (jbwiv)
[1]: http://observium.org/ "Observium web site"
Observium was written by:
html/pages/delsrv.inc.php
+9 -2
View File
@@ -13,7 +13,14 @@ else {
}
foreach (dbFetchRows('SELECT * FROM `services` AS S, `devices` AS D WHERE S.device_id = D.device_id ORDER BY hostname') as $device) {
$servicesform .= "<option value='".$device['service_id']."'>".$device['service_id'].'.'.$device['hostname'].' - '.$device['service_type'].'</option>';
$service_description = '';
if (!empty($device['service_desc'])) {
$service_description = ' - ' . substr($device['service_desc'], 0, 30);
}
$servicesform .= "<option value='".$device['service_id']."'>".$device['hostname'].' - '.$device['service_type'].$service_description.'</option>';
}
if ($updated) {
@@ -26,7 +33,7 @@ else {
<input type=hidden name='delsrv' value='yes'>
<div class='well well-lg'>
<div class='form-group'>
<label for='service' class='col-sm-2 control-label'>Device - Service</label>
<label for='service' class='col-sm-2 control-label'>Device - Service - Description</label>
<div class='col-sm-5'>
<select name='service' id='service' class='form-control input-sm'>
$servicesform
html/pages/editsrv.inc.php
+8 -2
View File
@@ -13,7 +13,13 @@ else {
}
foreach (dbFetchRows('SELECT * FROM `services` AS S, `devices` AS D WHERE S.device_id = D.device_id ORDER BY hostname') as $device) {
$servicesform .= "<option value='".$device['service_id']."'>".$device['hostname'].' - '.$device['service_type'].'</option>';
$service_description = '';
if (!empty($device['service_desc'])) {
$service_description = ' - ' . substr($device['service_desc'], 0, 30);
}
$servicesform .= "<option value='".$device['service_id']."'>".$device['hostname'].' - '.$device['service_type'].$service_description.'</option>';
}
if ($updated) {
@@ -30,7 +36,7 @@ else {
<input type=hidden name='delsrv' value='yes'>
<div class='well well-lg'>
<div class='form-group'>
<label for='service' class='col-sm-2 control-label'>Device - Service</label>
<label for='service' class='col-sm-2 control-label'>Device - Service - Description</label>
<div class='col-sm-5'>
<select name='service' id='service' class='form-control input-sm'>
$servicesform