Merge pull request #16 from GergeFreeman/master

Возможность изменения section у настроек

actions/SettingsAction.php

@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of PHP CS Fixer.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace yii2mod\settings\actions;
 
 use Yii;
@@ -10,9 +20,7 @@
 use yii2mod\settings\events\FormEvent;
 
 /**
- * Class SettingsAction
- *
- * @package yii2mod\settings\actions
+ * Class SettingsAction.
  */
 class SettingsAction extends Action
 {
@@ -35,8 +43,8 @@ class SettingsAction extends Action
 
     /**
      * @var callable a PHP callable that will be called for save the settings.
-     * If not set, [[saveSettings()]] will be used instead.
-     * The signature of the callable should be:
+     *               If not set, [[saveSettings()]] will be used instead.
+     *               The signature of the callable should be:
      *
      * ```php
      * function ($model) {
@@ -48,8 +56,8 @@ class SettingsAction extends Action
 
     /**
      * @var callable a PHP callable that will be called to prepare a model.
-     * If not set, [[prepareModel()]] will be used instead.
-     * The signature of the callable should be:
+     *               If not set, [[prepareModel()]] will be used instead.
+     *               The signature of the callable should be:
      *
      * ```php
      * function ($model) {
@@ -59,6 +67,11 @@ class SettingsAction extends Action
      */
     public $prepareModel;
 
+    /**
+     * @var string
+     */
+    public $sectionSettings;
+
     /**
      * @var string message to be set on successful save a model
      */
@@ -75,7 +88,7 @@ class SettingsAction extends Action
     public $viewParams = [];
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -119,7 +132,7 @@ public function run()
     }
 
     /**
-     * Prepares the model which will be used to validate the attributes
+     * Prepares the model which will be used to validate the attributes.
      *
      * @param Model $model
      */
@@ -129,7 +142,7 @@ protected function prepareModel(Model $model)
             call_user_func($this->prepareModel, $model);
         } else {
             foreach ($model->attributes() as $attribute) {
-                $model->{$attribute} = Yii::$app->settings->get($model->formName(), $attribute);
+                $model->{$attribute} = Yii::$app->settings->get($this->getSection($model), $attribute);
             }
         }
     }
@@ -143,8 +156,22 @@ protected function saveSettings(Model $model)
             call_user_func($this->saveSettings, $model);
         } else {
             foreach ($model->toArray() as $key => $value) {
-                Yii::$app->settings->set($model->formName(), $key, $value);
+                Yii::$app->settings->set($this->getSection($model), $key, $value);
             }
         }
     }
+
+    /**
+     * @param Model $model
+     *
+     * @return string
+     */
+    protected function getSection(Model $model)
+    {
+        if ($this->sectionSettings) {
+            return $this->sectionSettings;
+        }
+
+        return $model->formName();
+    }
 }