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

Author: daftspunk

modules/backend/widgets/ReportContainer.php

@@ -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);
+        if (!$configuration) {
+            $configuration = 'config_report_container.yaml';
         }
-        else {
-            $config = [];
+
+        if (!is_array($configuration)) {
+            $path = $controller->getConfigPath($configuration);
+            if (File::isFile($path)) {
+                $configuration = $this->makeConfig($path);
+            }
+            else {
+                $configuration = [];
+            }
         }
 
-        parent::__construct($controller, $config);
+        parent::__construct($controller, $configuration);
 
         $this->bindToController();
         $this->fillFromConfig();