diff options
| author | NOYB <Al_Stu@Frontier.com> | 2016-05-25 12:04:19 -0700 |
|---|---|---|
| committer | Jared Dillard <jdillard@netgate.com> | 2016-06-07 15:40:24 -0500 |
| commit | 8858f45f03dae2ba2dbe14df4052097452b64312 (patch) | |
| tree | cd5f99501f6f54b20dbd967610edd55064f03d77 | |
| parent | 73b95dee7d097b64f3cb2b62b2aa7ee0b6034fbe (diff) | |
| download | FreeBSD-ports-8858f45f03dae2ba2dbe14df4052097452b64312.zip FreeBSD-ports-8858f45f03dae2ba2dbe14df4052097452b64312.tar.gz | |
Status Monitoring - Default Resolution II
Adjust saved default time period and resolution order.
// Time period setting change applies valid resolutions and selects the default resolution of the time period.
// Time period setting needs to be before resolution so that the time period default doesn't override the page load default resolution.
// Time period setting needs to be before custom start/end date/time so those will be enabled before applying their setting.
Fixes bug 6402
| -rw-r--r-- | sysutils/pfSense-Status_Monitoring/files/usr/local/www/status_monitoring.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sysutils/pfSense-Status_Monitoring/files/usr/local/www/status_monitoring.php b/sysutils/pfSense-Status_Monitoring/files/usr/local/www/status_monitoring.php index be63e90..187bafa 100644 --- a/sysutils/pfSense-Status_Monitoring/files/usr/local/www/status_monitoring.php +++ b/sysutils/pfSense-Status_Monitoring/files/usr/local/www/status_monitoring.php @@ -113,7 +113,10 @@ if(strpos($config['rrd']['category'], '&resolution') === false) { //save new defaults if ($_POST['defaults']) { - $config['rrd']['category'] = "left=".$_POST['graph-left']."&right=".$_POST['graph-right']."&resolution=".$_POST['resolution']."&timePeriod=".$_POST['time-period']."&startDate=".$_POST['start-date']."&endDate=".$_POST['end-date']."&startTime=".$_POST['start-time']."&endTime=".$_POST['end-time']."&graphtype=".$_POST['graph-type']."&invert=".$_POST['invert']; + // Time period setting change applies valid resolutions and selects the default resolution of the time period. + // Time period setting needs to be before resolution so that the time period default doesn't override the page load default resolution. + // Time period setting needs to be before custom start/end date/time so those will be enabled before applying their setting. + $config['rrd']['category'] = "left=".$_POST['graph-left']."&right=".$_POST['graph-right']."&timePeriod=".$_POST['time-period']."&resolution=".$_POST['resolution']."&startDate=".$_POST['start-date']."&endDate=".$_POST['end-date']."&startTime=".$_POST['start-time']."&endTime=".$_POST['end-time']."&graphtype=".$_POST['graph-type']."&invert=".$_POST['invert']; write_config(); $savemsg = "The changes have been applied successfully."; } |
