mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix incorrectly marking the settings on aggregate graphs as invalid

Browse Source
This commit is contained in:
Tony Murray
2018-12-17 09:35:09 -06:00
parent 41b1dc67ed
commit 3830bdf5a0
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Widgets/GraphController.php
View File

@@ -154,14 +154,12 @@ class GraphController extends WidgetController
{
$settings = $this->getSettings();
// get type
$type = $this->getGraphType();
// force settings if not initialized
if (is_null($type) || empty($settings['graph_' . $this->getGraphType(false)])) {
if ($this->hasInvalidSettings()) {
return $this->getSettingsView($request);
}
$type = $this->getGraphType();
$param = '';
if ($type == 'device') {
@@ -224,6 +222,16 @@ class GraphController extends WidgetController
return $type;
}
private function hasInvalidSettings()
{
$raw_type = $this->getGraphType(false);
if ($raw_type == 'custom' || $this->getGraphType() != 'aggregate') {
return empty($this->getSettings()['graph_' . $raw_type]);
}
return false; // non-custom aggregate types require no additional settings
}
public function getSettings()
{
if (is_null($this->settings)) {