nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-03 00:11:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2211 from laf/issue-2200

Browse Source 
Updated devices Graphs links to use non-static time references
This commit is contained in:
Mike Rostermund
2015-10-26 21:50:49 +01:00
parent 9a4462f38f 7775d6d07e
commit 99e72a5361
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/js/librenms.js
+2 -2
View File
@@ -99,8 +99,8 @@ $(document).ready(function() {
}); });
function submitCustomRange(frmdata) { function submitCustomRange(frmdata) {
var reto = /to=([0-9])+/g; var reto = /to=([0-9a-zA-Z\-])+/g;
var refrom = /from=([0-9])+/g; var refrom = /from=([0-9a-zA-Z\-])+/g;
var tsto = moment(frmdata.dtpickerto.value).unix(); var tsto = moment(frmdata.dtpickerto.value).unix();
var tsfrom = moment(frmdata.dtpickerfrom.value).unix(); var tsfrom = moment(frmdata.dtpickerfrom.value).unix();
frmdata.selfaction.value = frmdata.selfaction.value.replace(reto, 'to=' + tsto); frmdata.selfaction.value = frmdata.selfaction.value.replace(reto, 'to=' + tsto);
html/pages/devices.inc.php
+3 -3
View File
@@ -51,7 +51,7 @@ foreach ($menu_options as $option => $text) {
if ($vars['format'] == 'graph_'.$option) { if ($vars['format'] == 'graph_'.$option) {
echo("<span class='pagemenu-selected'>"); echo("<span class='pagemenu-selected'>");
} }
echo('<a href="' . generate_url($vars, array('format' => 'graph_'.$option, 'from' => $config['time']['day'], 'to' => $config['time']['now'])) . '">' . $text . '</a>'); echo('<a href="' . generate_url($vars, array('format' => 'graph_'.$option, 'from' => '-24h', 'to' => 'now')) . '">' . $text . '</a>');
if ($vars['format'] == 'graph_'.$option) { if ($vars['format'] == 'graph_'.$option) {
echo("</span>"); echo("</span>");
} }
@@ -91,13 +91,13 @@ list($format, $subformat) = explode("_", $vars['format'], 2);
if($format == "graph") { if($format == "graph") {
if (!is_numeric($vars['from'])) { if (empty($vars['from'])) {
$graph_array['from'] = $config['time']['day']; $graph_array['from'] = $config['time']['day'];
} }
else { else {
$graph_array['from'] = $vars['from']; $graph_array['from'] = $vars['from'];
} }
if (!is_numeric($vars['to'])) { if (empty($vars['to'])) {
$graph_array['to'] = $config['time']['now']; $graph_array['to'] = $config['time']['now'];
} }
else { else {