mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixes a bug in report container not loading defaults and ignoring context

Browse Source
This commit is contained in:
Samuel Georges 2015-07-16 18:04:35 +10:00
parent e69be53317
commit 8e3d3d5e30
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/backend/widgets/ReportContainer.php
View File

@ -73,18 +73,23 @@ class ReportContainer extends WidgetBase
/**
* Constructor.
*/
public function __construct($controller)
public function __construct($controller, $configuration = null)
{
$configFile = 'config_' . snake_case($this->alias) . '.yaml';
$path = $controller->getConfigPath($configFile);
if (File::isFile($path)) {
$config = $this->makeConfig($configFile);
}
else {
$config = [];
if (!$configuration) {
$configuration = 'config_report_container.yaml';
}
parent::__construct($controller, $config);
if (!is_array($configuration)) {
$path = $controller->getConfigPath($configuration);
if (File::isFile($path)) {
$configuration = $this->makeConfig($path);
}
else {
$configuration = [];
}
}
parent::__construct($controller, $configuration);
$this->bindToController();
$this->fillFromConfig();