Merge remote-tracking branch 'origin/master' into dev-2.0

Author: unclead

CHANGELOG.md

@@ -1,6 +1,11 @@
 Yii2 multiple input change log
 ==============================
 
+1.4.1
+=====
+
+- #99: Respect "defaultValue" if it is set and current value is empty (unclead)
+
 1.4.0
 -----
 

README.md

@@ -8,7 +8,7 @@ Yii2 widget for handle multiple inputs for an attribute of model and tabular inp
 [![License](https://poser.pugx.org/unclead/yii2-multiple-input/license)](https://packagist.org/packages/unclead/yii2-multiple-input)
 
 ##Latest release
-The latest stable version of the extension is v1.4.0 Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
+The latest stable version of the extension is v1.4.1 Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
 
 ##Installation
 The preferred way to install this extension is through [composer](http://getcomposer.org/download/).

composer.json

@@ -9,7 +9,7 @@
         "yii2 tabular input"
     ],
     "type": "yii2-extension",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "license": "BSD-3-Clause",
     "support": {
         "issues": "https://github.com/unclead/yii2-multiple-input/issues?state=open",

docs/usage.md

@@ -3,7 +3,7 @@
 > You can find source code of examples [here](./examples/)
 
 - [One column](#one-column)
-- [Multiple columns](#multiple-columns-example)
+- [Multiple columns](#multiple-columns)
 - [Tabular input](#tabular-input)
 
 ##One column

examples/views/tabular-input.php

@@ -36,6 +36,7 @@
             'name' => 'title',
             'title' => 'Title',
             'type' => TabularColumn::TYPE_TEXT_INPUT,
+            'defaultValue' => 'Test',
             'enableError' => true
         ],
         [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.multipleInput",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "jQuery multipleInput",
   "scripts": {
 	  "build": "npm install && (gulp || node node_modules/gulp/bin/gulp.js)"

src/components/BaseColumn.php

@@ -180,6 +180,7 @@ protected function prepareValue()
         if ($this->value instanceof \Closure) {
             $value = call_user_func($this->value, $data);
         } else {
+            $value = null;
             if ($data instanceof ActiveRecordInterface ) {
                 $value = $data->getAttribute($this->name);
             } elseif ($data instanceof Model) {
@@ -188,13 +189,20 @@ protected function prepareValue()
                 $value = ArrayHelper::getValue($data, $this->name, null);
             } elseif(is_string($data) || is_numeric($data)) {
                 $value = $data;
-            }else {
+            }
+
+            if ($this->isEmpty($value) && $this->defaultValue !== null) {
                 $value = $this->defaultValue;
             }
         }
         return $value;
     }
 
+    protected function isEmpty($value)
+    {
+        return $value === null || $value === [] || $value === '';
+    }
+
     /**
      * Returns element id.
      *
@@ -469,6 +477,7 @@ protected function renderWidget($type, $name, $value, $options)
     {
         $model = $this->getModel();
         if ($model instanceof Model) {
+            $model->{$this->name} = $value;
             $widgetOptions = [
                 'model'     => $model,
                 'attribute' => $this->name,