Commit 8a436c4a by Kartik Visweswaran

Code cleanup.

Removed redundant declarations and checks in the code.
parent c5506285
......@@ -7,10 +7,6 @@
namespace frontend\widgets;
use yii\helpers\Html;
use yii\bootstrap\Widget;
use yii\bootstrap\Alert as BsAlert;
/**
* Alert widget renders a message from session flash. All flash messages are displayed
* in the sequence they were assigned using setFlash. You can set message as following:
......@@ -22,7 +18,7 @@ use yii\bootstrap\Alert as BsAlert;
* @author Alexander Makarov <sam@rmcerative.ru>
* @author Kartik Visweswaran <kartikv2@gmail.com>
*/
class Alert extends Widget
class Alert extends \yii\bootstrap\Widget
{
/**
* @var array the allowed bootstrap alert types.
......@@ -34,38 +30,23 @@ class Alert extends Widget
*/
public $closeButton = [];
private $_doNotRender = true;
public function init()
{
$this->_doNotRender = true;
$session = \Yii::$app->getSession();
$flashes = $session->getAllFlashes();
$baseCssClass = isset($this->options['class']) ? $this->options['class'] : '';
$appendCss = isset($this->options['class']) ? $this->options['class'] : '';
foreach ($flashes as $type => $message) {
if (in_array($type, $this->allowedTypes)) {
$this->options['class'] = (($type === 'error') ? "alert-danger" : "alert-{$type}") . ' ' . $baseCssClass;
echo BsAlert::widget([
$this->options['class'] = (($type === 'error') ? 'alert-danger' : 'alert-' . $type) . ' ' . $appendCss;
echo \yii\bootstrap\Alert::widget([
'body' => $message,
'closeButton' => $this->closeButton,
'options' => $this->options
]);
Html::removeCssClass($this->options, $class);
$session->removeFlash($type);
$this->_doNotRender = false;
}
}
if (!$this->_doNotRender) {
parent::init();
}
}
public function run()
{
if (!$this->_doNotRender) {
parent::run();
}
parent::init();
}
}
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