opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Fix graph selection when to/from missing from url (#15946) 

* Fix graph selection when to/from missing from url
fixes #15840

* Update js cache value
This commit is contained in:
Tony Murray 2024-04-14 16:48:01 -05:00 committed by GitHub
parent 3d810970fb
commit 5828907b23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
html/js/librenms.js
View File

@ -66,8 +66,19 @@ function submitCustomRange(frmdata) {
var refrom = /from=([0-9a-zA-Z\-])+/g;
var tsto = $("#dtpickerto").data("DateTimePicker").date().unix();
var tsfrom = $("#dtpickerfrom").data("DateTimePicker").date().unix();
frmdata.selfaction.value = frmdata.selfaction.value.replace(reto, 'to=' + tsto);
frmdata.selfaction.value = frmdata.selfaction.value.replace(refrom, 'from=' + tsfrom);
if (frmdata.selfaction.value.match(reto)) {
frmdata.selfaction.value = frmdata.selfaction.value.replace(reto, 'to=' + tsto);
} else {
frmdata.selfaction.value += '/to=' + tsto;
}
if (frmdata.selfaction.value.match(refrom)) {
frmdata.selfaction.value = frmdata.selfaction.value.replace(refrom, 'from=' + tsfrom);
} else {
frmdata.selfaction.value += '/from=' + tsfrom;
}
frmdata.action = frmdata.selfaction.value;
return true;
}

2
resources/views/layouts/librenmsv1.blade.php
View File

@ -76,7 +76,7 @@
});
var ajax_url = "{{ url('/ajax') }}";
</script>
<script src="{{ asset('js/librenms.js?ver=31012024') }}"></script>
<script src="{{ asset('js/librenms.js?ver=14042024') }}"></script>
<script type="text/javascript" src="{{ asset('js/overlib_mini.js') }}"></script>
<script type="text/javascript" src="{{ asset('js/flasher.min.js?ver=0.6.1') }}"></script>
<script type="text/javascript" src="{{ asset('js/toastr.min.js?ver=05072021') }}"></script>