From f7cd33fd7817aef25a3636fc2c7fed5fd54b3f83 Mon Sep 17 00:00:00 2001
From: sanek <semenov@skeeks.com>
Date: Mon, 6 Apr 2015 01:45:12 +0300
Subject: [PATCH] new module

---
 CHANGELOG.md                                          |  6 ++++++
 Module.php                                            |  2 +-
 migrations/m150405_230558_alter_table__form_field.php | 23 +++++++++++++++++++++++
 models/FormField.php                                  |  3 ++-
 models/FormSendMessage.php                            |  2 +-
 views/admin-form/_form.php                            |  5 +++++
 6 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 CHANGELOG.md
 create mode 100644 migrations/m150405_230558_alter_table__form_field.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..85bf956
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+Процесс разработки модуля.
+==============
+
+1.0.3
+-----------------
+  * У полей формы добавлено значение активности.
diff --git a/Module.php b/Module.php
index 8146a49..8b15674 100644
--- a/Module.php
+++ b/Module.php
@@ -23,7 +23,7 @@ class Module extends CmsModule
     protected function _descriptor()
     {
         return array_merge(parent::_descriptor(), [
-            "version"       => "1.0.2",
+            "version"       => "1.0.3",
 
             "name"          => "Модуль конструктор форм",
             "description"   => "Модуль прорабатывает модель данных игрового портала. Поставляет модели Игра, Игровой жанр, Игровая платформа, Игровая компания (разработчик, издатель)",
diff --git a/migrations/m150405_230558_alter_table__form_field.php b/migrations/m150405_230558_alter_table__form_field.php
new file mode 100644
index 0000000..2342913
--- /dev/null
+++ b/migrations/m150405_230558_alter_table__form_field.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @author Semenov Alexander <semenov@skeeks.com>
+ * @link http://skeeks.com/
+ * @copyright 2010 SkeekS (СкикС)
+ * @date 03.04.2015
+ */
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150405_230558_alter_table__form_field extends Migration
+{
+    public function safeUp()
+    {
+        $this->execute("ALTER TABLE {{%form_field}} ADD `active` TINYINT(1) NOT NULL DEFAULT '1' ;");
+    }
+
+    public function down()
+    {
+        echo "m150122_273205_alter_table__cms_user__emails_adn_phones cannot be reverted.\n";
+        return false;
+    }
+}
diff --git a/models/FormField.php b/models/FormField.php
index efec303..bf9f244 100644
--- a/models/FormField.php
+++ b/models/FormField.php
@@ -64,7 +64,7 @@ class FormField extends Core
     public function rules()
     {
         return array_merge(parent::rules(), [
-            [['created_by', 'updated_by', 'created_at', 'updated_at', 'form_id'], 'integer'],
+            [['created_by', 'updated_by', 'created_at', 'updated_at', 'form_id', 'active'], 'integer'],
             [['hint'], 'string'],
             [['element_config'], 'safe'],
             [['priority'], 'integer'],
@@ -114,6 +114,7 @@ class FormField extends Core
             'hint'       => \Yii::t('app', 'Небольшая подсказка элемента'),
             'name'       => \Yii::t('app', 'Название'),
             'label'       => \Yii::t('app', 'Label элемента'),
+            'active'       => \Yii::t('app', 'Активность'),
         ]);
     }
 
diff --git a/models/FormSendMessage.php b/models/FormSendMessage.php
index aaaee4f..b760525 100644
--- a/models/FormSendMessage.php
+++ b/models/FormSendMessage.php
@@ -182,7 +182,7 @@ class FormSendMessage extends Core
                             'form'              => $form,
                             'formSendMessage'   => $this
                         ])
-                        ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name])
+                        ->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->name])
                         ->setTo($formEmail->value)
                         ->setSubject("Отправка формы «{$form->name}» #" . $this->id)
                         ->send();
diff --git a/views/admin-form/_form.php b/views/admin-form/_form.php
index d786734..0a7aeeb 100644
--- a/views/admin-form/_form.php
+++ b/views/admin-form/_form.php
@@ -76,9 +76,14 @@ use common\models\User;
             'sortable' => true,
             'columns' => [
                 //['class' => 'yii\grid\SerialColumn'],
+                'attribute',
                 'name',
                 'label',
                 'hint',
+                [
+                    'class' => \skeeks\cms\grid\BooleanColumn::className(),
+                    'attribute' => 'active'
+                ],
             ],
         ],
     ]); ?>
--
libgit2 0.26.0