Skip to content

Y
yii2
Commit d3041415 by Qiang Xue
Options

Merge pull request #2404 from Jasrags/master

Added in an isset check because if you set a flash type that is not in o...
parents 1cd3f2bb 06c3086d
Showing with 15 additions and 13 deletions
apps/advanced/frontend/widgets/Alert.php
...@@ -33,12 +33,12 @@ class Alert extends \yii\bootstrap\Widget ...@@ -33,12 +33,12 @@ class Alert extends \yii\bootstrap\Widget
'info' => 'alert-info', 'info' => 'alert-info',
'warning' => 'alert-warning' 'warning' => 'alert-warning'
]; ];
/** /**
* @var array the options for rendering the close button tag. * @var array the options for rendering the close button tag.
*/ */
public $closeButton = []; public $closeButton = [];
public function init() public function init()
{ {
parent::init(); parent::init();
...@@ -46,21 +46,23 @@ class Alert extends \yii\bootstrap\Widget ...@@ -46,21 +46,23 @@ class Alert extends \yii\bootstrap\Widget
$session = \Yii::$app->getSession(); $session = \Yii::$app->getSession();
$flashes = $session->getAllFlashes(); $flashes = $session->getAllFlashes();
$appendCss = isset($this->options['class']) ? ' ' . $this->options['class'] : ''; $appendCss = isset($this->options['class']) ? ' ' . $this->options['class'] : '';
foreach ($flashes as $type => $message) { foreach ($flashes as $type => $message) {
/* initialize css class for each alert box */ if (isset($this->alertTypes[$type])) {
$this->options['class'] = $this->alertTypes[$type] . $appendCss; /* initialize css class for each alert box */
$this->options['class'] = $this->alertTypes[$type] . $appendCss;
/* assign unique id to each alert box */ /* assign unique id to each alert box */
$this->options['id'] = $this->getId() . '-' . $type; $this->options['id'] = $this->getId() . '-' . $type;
echo \yii\bootstrap\Alert::widget([ echo \yii\bootstrap\Alert::widget([
'body' => $message, 'body' => $message,
'closeButton' => $this->closeButton, 'closeButton' => $this->closeButton,
'options' => $this->options, 'options' => $this->options,
]); ]);
$session->removeFlash($type); $session->removeFlash($type);
}
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment