test

Yarik
1 parent c1040009
Showing 5 changed files with 48 additions and 7 deletions Show diff stats
common/models/CompanyInfo.php
common/models/UserInfo.php
console/migrations/m160309_124241_add_vacancy_status.php
console/migrations/m160310_080610_hide_email_to_user_info.php
frontend/views/accounts/general.php
@@ -11,7 +11,6 @@
      * @property integer $staff
      * @property string  $street
      * @property string  $house
-     * @property integer $hide_mail
      */
     class CompanyInfo extends \yii\db\ActiveRecord
     {
@@ -45,10 +44,6 @@
                     'string',
                 ],
                 [
-                    [ 'hide_mail' ],
-                    'integer',
-                ],
-                [
                     [ 'staff' ],
                     'default',
                     'value' => 1,
@@ -72,7 +67,6 @@
                 'staff'           => Yii::t('app', 'Количество сотрудников'),
                 'street'          => Yii::t('app', 'Улица'),
                 'house'           => Yii::t('app', 'Дом'),
-                'hide_mail'       => Yii::t('app', 'не публиковать Email'),
             ];
         }
     }
@@ -30,6 +30,7 @@
      * @property string  $geography
      * @property integer $salary_currency
      * @property string $email
+     * @property integer $hide_mail
      */
     class UserInfo extends \yii\db\ActiveRecord
     {
@@ -215,6 +216,17 @@
                     ],
                     'email',
                 ],
+                [
+                    [ 'hide_mail' ],
+                    'integer',
+                    'min' => 0,
+                    'max' => 1,
+                ],
+                [
+                    ['hide_mail'],
+                    'default',
+                    'value' => 0,
+                ]
             ];
         }
@@ -268,6 +280,7 @@
                 'salary_currency' => Yii::t('app', 'Валюта'),
                 'is_customer'     => '',
                 'is_freelancer'   => '',
+                'hide_mail'       => Yii::t('app', 'не публиковать Email'),
             ];
         }
+<?php
+
+use yii\db\Migration;
+
+class m160309_124241_add_vacancy_status extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('{{%vacancy}}', 'status', $this->integer()->defaultValue(1));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('{{%vacancy}}', 'status');
+    }
+}
+<?php
+
+use yii\db\Migration;
+
+class m160310_080610_hide_email_to_user_info extends Migration
+{
+    public function up()
+    {
+        $this->dropColumn('{{%company_info}}', 'hide_mail');
+        $this->addColumn('{{%user_info}}', 'hide_mail', $this->smallInteger()->defaultValue(0));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('{{%user_info}}', 'hide_mail');
+        $this->addColumn('{{%company_info}}', 'hide_mail', $this->smallInteger()->defaultValue(0));
+    }
+}
@@ -176,7 +176,7 @@
             ?>
             </div>
             <div class="input-blocks hide-mail-check">
-            <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group', ], 'template' => "{input}{label}\n{hint}\n{error}"])
+            <?= $form->field ($user_info, 'hide_mail', ['options' => ['class' => 'form-group', ], 'template' => "{input}{label}\n{hint}\n{error}"])
                       ->label ('<span></span>не публиковать Email')
                       ->checkbox (['checked'=>'checked', 'class'=> 'custom-check'], false);
             ?>