Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-21 22:47:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4a201c7ad5b1baad3487d21d888f6e683052017f' into feature/toolbar-ui-2

Browse Source
This commit is contained in:
Tobias Munk
2014-02-07 11:13:44 +01:00
parent 2f5526656b 4a201c7ad5
commit dc110a9c05
51 changed files with 34 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/debug/Module.php
View File

@@ -11,7 +11,6 @@ use Yii;
use yii\base\Application;
use yii\web\View;
use yii\web\ForbiddenHttpException;
use yii\helpers\ArrayHelper;
/**
* The Yii Debug Module provides the debug toolbar and debugger
@@ -40,7 +39,8 @@ class Module extends \yii\base\Module
/**
* @var array list of debug panels. The array keys are the panel IDs, and values are the corresponding
* panel class names or configuration arrays. This will be merged with [[corePanels()]].
* You may set a panel to be false to disable a core panel.
* You may reconfigure a core panel via this property by using the same panel ID.
* You may also disable a core panel by setting it to be false in this property.
*/
public $panels = [];
/**
@@ -76,7 +76,19 @@ class Module extends \yii\base\Module
Yii::$app->getView()->on(View::EVENT_END_BODY, [$this, 'renderToolbar']);
});
$this->panels = array_filter(ArrayHelper::merge($this->corePanels(), $this->panels));
// merge custom panels and core panels so that they are ordered mainly by custom panels
if (empty($this->panels)) {
$this->panels = $this->corePanels();
} else {
$corePanels = $this->corePanels();
foreach ($corePanels as $id => $config) {
if (isset($this->panels[$id])) {
unset($corePanels[$id]);
}
}
$this->panels = array_filter(array_merge($corePanels, $this->panels));
}
foreach ($this->panels as $id => $config) {
$config['module'] = $this;
$config['id'] = $id;