Add NsValidator to bulk change NS form

hiqdev · Dec 9, 2015 · cda5d94 · cda5d94
1 parent 22feb8f
commit cda5d94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/models/Domain.php b/src/models/Domain.php
@@ -20,11 +20,13 @@
 use Exception;
 use hipanel\helpers\ArrayHelper;
 use hipanel\helpers\StringHelper;
+use hipanel\modules\client\validators\NsValidator;
 use hipanel\modules\dns\models\Record;
 use hipanel\modules\dns\validators\DomainPartValidator;
 use hipanel\validators\DomainValidator;
 use Yii;
 use yii\helpers\Html;
+use yii\validators\IpValidator;
 
 class Domain extends \hipanel\base\Model
 {
@@ -99,7 +101,8 @@ public function rules()
             [['nameservers', 'nsips'], 'filter', 'filter' => function ($value) {
                 return !is_array($value) ? StringHelper::mexplode($value) : $value;
             }, 'on' => 'OLD-set-ns'],
-            [['nameservers', 'nsips'], 'each', 'rule' => [DomainValidator::className()], 'on' => 'OLD-set-ns'],
+            [['nameservers'], 'each', 'rule' => [DomainValidator::className()], 'on' => 'OLD-set-ns'],
+            [['nsips'], 'each', 'rule' => [NsValidator::class], 'on' => 'OLD-set-ns'],
             [['dumb'], 'safe', 'on' => ['get-zones']],
         ];
     }

diff --git a/src/widgets/views/ns.php b/src/widgets/views/ns.php
@@ -111,7 +111,9 @@
                                         <?= $form->field($nsModel, "[$i]name")->textInput(['placeholder' => $nsModel->getAttributeLabel('name')])->label(false) ?>
                                     </div>
                                     <div class="col-md-5">
-                                        <?= $form->field($nsModel, "[$i]ip")->textInput(['disabled' => !StringHelper::endsWith($nsModel->name, $model->domain), 'placeholder' => $nsModel->getAttributeLabel('ip')])->label(false) ?>
+                                        <?php if (!is_array($model)) : ?>
+                                            <?= $form->field($nsModel, "[$i]ip")->textInput(['disabled' => !StringHelper::endsWith($nsModel->name, $model->domain), 'placeholder' => $nsModel->getAttributeLabel('ip')])->label(false) ?>
+                                        <?php endif; ?>
                                     </div>
                                     <div class="col-md-2 text-right">
                                         <div class="btn-group" role="group">