Merge pull request noumo#79 from noumo/layout

Controller layout fix
abomfim · Aug 16, 2015 · 9c73587 · 9c73587
2 parents 29a41ba + 3681b0b
commit 9c73587
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/AdminModule.php b/AdminModule.php
@@ -16,6 +16,7 @@ class AdminModule extends \yii\base\Module implements BootstrapInterface
 
     public $settings;
     public $activeModules;
+    public $controllerLayout = '@easyii/views/layouts/main';
 
     private $_installed;
 
@@ -71,4 +72,4 @@ public function getInstalled()
         }
         return $this->_installed;
     }
-}
+}
diff --git a/components/Controller.php b/components/Controller.php
@@ -12,9 +12,14 @@
 class Controller extends \yii\web\Controller
 {
     public $enableCsrfValidation = false;
-    public $layout = '@easyii/views/layouts/main';
     public $rootActions = [];
     public $error = null;
+
+    public function init()
+    {
+        parent::init();
+        $this->layout = Yii::$app->getModule('admin')->controllerLayout;
+    }
 
     /**
      * Check authentication, and root rights for actions
@@ -118,4 +123,4 @@ public function formatResponse($success = '', $back = true)
             return $back ? $this->back() : $this->refresh();
         }
     }
-}
+}