added base64_encode for pk value, update EditableAction

Author: Igor Chepurnoy

Editable.php

@@ -33,6 +33,11 @@ class Editable extends InputWidget
      */
     public $mode = 'inline';
 
+    /**
+     * @var string placement of bootstrap popover
+     */
+    public $placement = 'top';
+
     /**
      * @var string|array Url for submit, e.g. '/post'
      */
@@ -69,9 +74,9 @@ public function init()
      */
     public function run()
     {
-        $linkText = $this->getLinkText();
-        echo Html::a($linkText, null, $this->options);
         $this->registerClientScript();
+
+        return Html::a($this->getLinkText(), null, $this->options);
     }
 
     /**
@@ -99,9 +104,6 @@ protected function registerClientScript()
         $id = ArrayHelper::remove($this->pluginOptions, 'selector', '#' . $this->options['id']);
         $id = preg_replace('/([.])/', '\\\\\\\$1', $id);
 
-        if ($this->hasActiveRecord() && $this->model->isNewRecord) {
-            $this->pluginOptions['send'] = 'always'; // send to server without pk
-        }
         $pluginOptions = $this->getPluginOptions();
         $js = "jQuery('$id').editable($pluginOptions);";
         $view->registerJs($js);
@@ -122,11 +124,16 @@ public function getPluginOptions()
             'pk',
             $this->hasActiveRecord() ? $this->model->getPrimaryKey() : null
         );
-        $this->pluginOptions['pk'] = $pk;
+        $this->pluginOptions['pk'] = base64_encode(serialize($pk));
         $this->pluginOptions['url'] = $this->url instanceof JsExpression ? $this->url : Url::toRoute($this->url);
         $this->pluginOptions['type'] = $this->type;
         $this->pluginOptions['mode'] = $this->mode;
         $this->pluginOptions['name'] = $this->attribute ?: $this->name;
+        $this->pluginOptions['placement'] = $this->placement;
+
+        if ($this->hasActiveRecord() && $this->model->isNewRecord) {
+            $this->pluginOptions['send'] = 'always';
+        }
 
         return Json::encode($this->pluginOptions);
     }

EditableAction.php

@@ -5,6 +5,7 @@
 use Yii;
 use yii\base\Action;
 use yii\base\InvalidConfigException;
+use yii\base\Model;
 use yii\web\BadRequestHttpException;
 
 /**
@@ -22,7 +23,7 @@ class EditableAction extends Action
     /**
      * @var string the scenario to be used (optional)
      */
-    public $scenario;
+    public $scenario = Model::SCENARIO_DEFAULT;
 
     /**
      * @var \Closure a function to be called previous saving model. The anonymous function is preferable to have the
@@ -33,7 +34,7 @@ class EditableAction extends Action
     /**
      * @var bool whether to create a model if a primary key parameter was not found
      */
-    public $forceCreate = true;
+    public $forceCreate = false;
 
     /**
      * @var string default pk column name
@@ -42,13 +43,11 @@ class EditableAction extends Action
 
     /**
      * @inheritdoc
-     *
-     * @throws \yii\base\InvalidConfigException
      */
     public function init()
     {
         if ($this->modelClass === null) {
-            throw new InvalidConfigException('ModelClass cannot be empty.');
+            throw new InvalidConfigException('The "modelClass" property must be set.');
         }
     }
 
@@ -61,50 +60,63 @@ public function init()
      */
     public function run()
     {
-        $class = $this->modelClass;
-        $pk = Yii::$app->request->post('pk');
+        $model = $this->findModelOrCreate();
+        $attribute = $this->getModelAttribute();
+
+        if ($this->preProcess && is_callable($this->preProcess, true)) {
+            call_user_func($this->preProcess, $model);
+        }
+
+        $model->setScenario($this->scenario);
+        $model->$attribute = Yii::$app->request->post('value');
+
+        if ($model->validate([$attribute])) {
+            return $model->save(false);
+        } else {
+            throw new BadRequestHttpException($model->getFirstError($attribute));
+        }
+    }
+
+    /**
+     * @return array|mixed
+     *
+     * @throws BadRequestHttpException
+     */
+    private function getModelAttribute()
+    {
         $attribute = Yii::$app->request->post('name');
-        //For attributes with format - relationName.attributeName
+
         if (strpos($attribute, '.')) {
             $attributeParts = explode('.', $attribute);
             $attribute = array_pop($attributeParts);
         }
-        $value = Yii::$app->request->post('value');
 
         if ($attribute === null) {
             throw new BadRequestHttpException('Attribute cannot be empty.');
         }
 
-        if ($value === null) {
-            throw new BadRequestHttpException('Value cannot be empty.');
-        }
+        return $attribute;
+    }
 
-        /** @var \Yii\db\ActiveRecord $model */
+    /**
+     * @return yii\db\ActiveRecord
+     *
+     * @throws BadRequestHttpException
+     */
+    private function findModelOrCreate()
+    {
+        $pk = unserialize(base64_decode(Yii::$app->request->post('pk')));
+        $class = $this->modelClass;
         $model = $class::findOne(is_array($pk) ? $pk : [$this->pkColumn => $pk]);
+
         if (!$model) {
-            if ($this->forceCreate) { // only useful for models with one editable attribute or no validations
+            if ($this->forceCreate) {
                 $model = new $class();
             } else {
                 throw new BadRequestHttpException('Entity not found by primary key ' . $pk);
             }
         }
 
-        // do we have a preProcess function
-        if ($this->preProcess && is_callable($this->preProcess, true)) {
-            call_user_func($this->preProcess, $model);
-        }
-
-        if ($this->scenario !== null) {
-            $model->setScenario($this->scenario);
-        }
-
-        $model->$attribute = $value;
-
-        if ($model->validate([$attribute])) {
-            // no need to specify which attributes as Yii2 handles that via [[BaseActiveRecord::getDirtyAttributes]]
-            return $model->save(false);
-        } else {
-            throw new BadRequestHttpException($model->getFirstError($attribute));
-        }
+        return $model;
     }
 }

EditableColumn.php

@@ -39,20 +39,20 @@ class EditableColumn extends DataColumn
      */
     public $type = 'text';
 
+    /**
+     * @var string
+     */
+    public $format = 'raw';
+
     /**
      * @inheritdoc
-     *
-     * @throws \yii\base\InvalidConfigException
      */
     public function init()
     {
-        if ($this->url === null) {
-            throw new InvalidConfigException('Url can not be empty.');
-        }
         parent::init();
 
-        if (!$this->format) {
-            $this->format = 'raw';
+        if ($this->url === null) {
+            throw new InvalidConfigException('The "url" property must be set.');
         }
 
         $rel = $this->attribute . '_editable' . $this->classSuffix;
@@ -76,7 +76,7 @@ protected function renderDataCellContent($model, $key, $index)
         $value = parent::renderDataCellContent($model, $key, $index);
         $url = (array)$this->url;
         $this->options['data-url'] = Url::to($url);
-        $this->options['data-pk'] = $key;
+        $this->options['data-pk'] = base64_encode(serialize($key));
         $this->options['data-name'] = $this->attribute;
         $this->options['data-type'] = $this->type;