Add message folder, add local states for domains

hiqdev · Dec 23, 2015 · acdc017 · acdc017
1 parent 6101948
commit acdc017
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 12 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -32,5 +32,18 @@ class Plugin extends \hiqdev\pluginmanager\Plugin
                 'class' => 'hipanel\modules\domain\Module',
             ],
         ],
+        'components' => [
+            'i18n' => [
+                'translations' => [
+                    'hipanel/domain' => [
+                        'class' => 'yii\i18n\PhpMessageSource',
+                        'basePath' => '@hipanel/modules/domain/messages',
+                        'fileMap' => [
+                            'hipanel/domain' => 'domain.php',
+                        ],
+                    ],
+                ],
+            ],
+        ],
     ];
 }
diff --git a/src/grid/DomainGridView.php b/src/grid/DomainGridView.php
@@ -42,9 +42,12 @@ public static function defaultColumns()
                 'filterAttribute' => 'domain_like',
             ],
             'state' => [
-                'class'         => RefColumn::className(),
+//                'class'         => RefColumn::className(),
+//                'gtype'         => 'state,domain',
                 'format'        => 'raw',
-                'gtype'         => 'state,domain',
+                'filter' => function ($grid, $model, $attribute) {
+                    return Html::activeDropDownList($model, $attribute, Domain::stateOptions(), ['prompt' => '--', 'class' => 'form-control']);
+                },
                 'filterInputOptions' => ['style' => 'width:120px'],
                 'value'         => function ($model) {
                     return State::widget(compact('model'));

diff --git a/src/messages/ru/domain.php b/src/messages/ru/domain.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'Domains in «ok» state' => 'В состоянии «ОК»',
+];
diff --git a/src/models/Domain.php b/src/models/Domain.php
@@ -27,10 +27,14 @@
 use hipanel\validators\DomainValidator;
 use Yii;
 use yii\helpers\Html;
-use yii\validators\IpValidator;
 
 class Domain extends \hipanel\base\Model
 {
+    const STATE_OK = 'ok';
+    const STATE_INCOMING = 'incoming';
+    const STATE_OUTGOING = 'outgoing';
+    const STATE_EXPIRED = 'expired';
+
     public $authCode;
 
     public static $contactOptions = [
@@ -40,6 +44,16 @@ class Domain extends \hipanel\base\Model
         'billing',
     ];
 
+    public static function stateOptions()
+    {
+        return [
+            self::STATE_OK => Yii::t('hipanel/domain', 'Domains in «ok» state'),
+            self::STATE_INCOMING => Yii::t('hipanel/domain', 'Incoming transfer domains'),
+            self::STATE_OUTGOING => Yii::t('hipanel/domain', 'Outgoing transfer domains'),
+            self::STATE_EXPIRED => Yii::t('hipanel/domain', 'Expired domains'),
+        ];
+    }
+
     use \hipanel\base\ModelTrait;
 
     /** {@inheritdoc} */

diff --git a/src/views/domain/_search.php b/src/views/domain/_search.php
@@ -1,6 +1,7 @@
 <?php
 
 use hipanel\modules\client\widgets\combo\ClientCombo;
+use hipanel\modules\domain\models\Domain;
 use hiqdev\combo\StaticCombo;
 use kartik\widgets\DatePicker;
 use yii\helpers\Html;
@@ -18,15 +19,7 @@
     </div>
 
     <div class="col-md-4">
-        <?= $search->field('state')->widget(StaticCombo::classname(), [
-            'data' => $stateData,
-            'hasId' => true,
-            'pluginOptions' => [
-                'select2Options' => [
-                    'multiple' => false,
-                ],
-            ],
-        ]) ?>
+        <?= $search->field('state')->dropDownList(Domain::stateOptions(), ['prompt' => '--']) ?>
         <div class="form-group">
             <?= Html::tag('label', 'Registered range', ['class' => 'control-label']); ?>
             <?= DatePicker::widget([