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 regression from 3cfffb9912 (#12661)

Browse Source
This commit is contained in:
Jellyfrog
2021-03-27 15:39:24 +01:00
committed by GitHub
parent c10c630708
commit ede486ea95
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Widgets/WidgetController.php
View File

@@ -60,24 +60,27 @@ abstract class WidgetController extends Controller
public function __invoke(Request $request)
{
$this->show_settings = (bool) $request->get('settings');
$settings = $this->getSettings();
if ($this->show_settings) {
$view = $this->getSettingsView($request);
} else {
if (! empty($settings['device_group'])) {
$this->title .= ' (' . DeviceGroup::find($settings['device_group'])->name . ')';
// This might be invoked in getSettingsView() in an extended class
// So don't run it before since it's cached.
$this->getSettings();
if (! empty($this->settings['device_group'])) {
$this->title .= ' (' . DeviceGroup::find($this->settings['device_group'])->name . ')';
}
$view = $this->getView($request);
}
if (! empty($settings['title'])) {
$title = $settings['title'];
if (! empty($this->settings['title'])) {
$title = $this->settings['title'];
} else {
$title = __(method_exists($this, 'title') ? app()->call([$this, 'title']) : $this->title);
}
return $this->formatResponse($view, $title, $settings);
return $this->formatResponse($view, $title, $this->settings);
}
/**