Breadcrumb: items to links

zelenin · Feb 18, 2015 · 91e9c1a · 91e9c1a
1 parent b2f83d1
commit 91e9c1a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/collections/Breadcrumb.php b/collections/Breadcrumb.php
@@ -9,7 +9,7 @@
 
 class Breadcrumb extends Widget
 {
-    public $items = [];
+    public $links = [];
     public $homeLink;
     public $itemOptions = [];
     public $encodeLabels = true;
@@ -40,7 +40,7 @@ public function renderItems()
             $items[] = $homelink;
         }
 
-        foreach ($this->items as $item) {
+        foreach ($this->links as $item) {
             if (!is_array($item)) {
                 $item = [
                     'label' => $item

diff --git a/modules/Checkbox.php b/modules/Checkbox.php
@@ -45,13 +45,12 @@ public function run()
             Html::addCssClass($this->options, self::TYPE_FITTED);
         }
 
-        //$this->options['label'] = null;
-
         echo Html::tag('div', $this->renderInput() . $this->renderLabel(), $this->options);
     }
 
     public function renderInput()
     {
+        $this->inputOptions['label'] = null;
         return $this->hasModel()
             ? Html::activeCheckbox($this->model, $this->attribute, $this->inputOptions)
             : Html::checkbox($this->name, $this->checked, $this->inputOptions);

diff --git a/modules/CheckboxList.php b/modules/CheckboxList.php
@@ -32,13 +32,15 @@ public function renderInput()
     public function getDefaultItem()
     {
         return function ($index, $label, $name, $checked, $value) {
+            $inputOptions =  $this->inputOptions;
+            $inputOptions['value'] = ArrayHelper::getValue($inputOptions, 'value', $value);
             return Html::tag(
                 'div',
                 Checkbox::widget([
                     'name' => $name,
                     'label' => $label,
                     'checked' => $checked,
-                    'inputOptions' => $this->inputOptions,
+                    'inputOptions' => $inputOptions,
                     'labelOptions' => $this->labelOptions
                 ]),
                 ['class' => 'field']