Account, Db, Hdomain - mass fixes

hiqdev · Aug 20, 2015 · 8c52cf3 · 8c52cf3
1 parent 755c0d9
commit 8c52cf3
Show file tree

Hide file tree

Showing 19 changed files with 170 additions and 77 deletions.
diff --git a/src/controllers/AccountController.php b/src/controllers/AccountController.php
@@ -20,9 +20,13 @@ public function actions()
                 'data'  => function ($action) {
                     return [
                         'stateData' => $action->controller->getStateData(),
+                        'typeData' => $action->controller->getTypeData(),
                     ];
                 }
             ],
+            'view' => [
+                'class'     => 'hipanel\actions\ViewAction'
+            ],
             'create'          => [
                 'class'   => 'hipanel\actions\SmartCreateAction',
                 'success' => Yii::t('app', 'Account creating task has been added to queue'),
@@ -58,4 +62,9 @@ public function getStateData()
     {
         return Ref::getList('state,account');
     }
+
+    public function getTypeData()
+    {
+        return Ref::getList('type,account');
+    }
 }
diff --git a/src/controllers/DbController.php b/src/controllers/DbController.php
@@ -24,6 +24,9 @@ public function actions()
                     ];
                 }
             ],
+            'view' => [
+                'class'     => 'hipanel\actions\ViewAction'
+            ],
             'create'          => [
                 'class'   => 'hipanel\actions\SmartCreateAction',
                 'success' => Yii::t('app', 'DB create task has been created successfully'),
@@ -44,6 +47,9 @@ public function actions()
                 'success' => Yii::t('app', 'DB description set successfully'),
                 'error'   => Yii::t('app', 'Failed to set DB description'),
             ],
+            'validate-form'   => [
+                'class' => 'hipanel\actions\ValidateFormAction',
+            ],
             'delete'          => [
                 'class'   => 'hipanel\actions\SmartPerformAction',
                 'success' => Yii::t('app', 'DB delete task has been created successfully'),

diff --git a/src/controllers/HdomainController.php b/src/controllers/HdomainController.php
@@ -27,7 +27,7 @@ public function actions()
             ],
             'view' => [
                 'class' => 'hipanel\actions\ViewAction',
-                'findOptions' => ['with_aliases' => true, 'with_vhosts' => true, 'with_request' => true],
+                'findOptions' => ['with_aliases' => true, 'with_vhosts' => true, 'with_request' => true, 'show_deleted' => true, 'show_aliases' => true],
             ],
             'create' => [
                 'class' => 'hipanel\actions\SmartCreateAction',
@@ -56,6 +56,9 @@ public function getStateData()
 
     public function getTypeData()
     {
-        return Ref::getList('type,hdomain');
+        return [
+            0 => Yii::t('app', 'Domain'),
+            1 => Yii::t('app', 'Alias'),
+        ];
     }
 }
diff --git a/src/grid/AccountGridView.php b/src/grid/AccountGridView.php
@@ -7,10 +7,12 @@
 
 namespace hipanel\modules\hosting\grid;
 
+use Yii;
 use hipanel\grid\ActionColumn;
 use hipanel\grid\MainColumn;
 use hipanel\grid\RefColumn;
 use hipanel\modules\hosting\widgets\account\State;
+use hipanel\modules\hosting\widgets\account\Type;
 use hipanel\modules\server\grid\ServerColumn;
 use hipanel\widgets\ArraySpoiler;
 
@@ -30,7 +32,7 @@ static public function defaultColumns()
                 'value'  => function ($model) {
                     return State::widget(compact('model'));
                 },
-                'gtype'  => 'state,db',
+                'gtype'  => 'state,account',
             ],
             'server'     => [
                 'class' => ServerColumn::className()
@@ -49,6 +51,14 @@ static public function defaultColumns()
                 'class'    => ActionColumn::className(),
                 'template' => '{view} {update} {delete}'
             ],
+            'type'      => [
+                'class'  => RefColumn::className(),
+                'format' => 'raw',
+                'value'  => function ($model) {
+                    return Type::widget(compact('model'));
+                },
+                'gtype'  => 'type,account',
+            ],
         ];
     }
 }
diff --git a/src/grid/HdomainGridView.php b/src/grid/HdomainGridView.php
@@ -12,6 +12,7 @@
 use hipanel\grid\RefColumn;
 use hipanel\modules\hosting\widgets\hdomain\State;
 use hipanel\modules\server\grid\ServerColumn;
+use hipanel\widgets\ArraySpoiler;
 use yii\helpers\Html;
 
 class HdomainGridView extends \hipanel\grid\BoxedGridView
@@ -64,6 +65,18 @@ static public function defaultColumns()
                 },
                 'gtype' => 'state,hdomain',
             ],
+            'dns_on' => [
+                'format' => 'raw',
+                'value' => function ($model) {
+                    return $model->dns_on ? \Yii::t('app', 'Enabled') : \Yii::t('app', 'Disabled');
+                }
+            ],
+            'aliases' => [
+                'format' => 'raw',
+                'value' => function ($model) {
+                    return ArraySpoiler::widget(['data' => $model->getAttribute('aliases')]);
+                }
+            ],
             'actions' => [
                 'class' => ActionColumn::className(),
                 'template' => '{view} {delete}'

diff --git a/src/models/Account.php b/src/models/Account.php
@@ -133,7 +133,7 @@ public function isOperable()
 
     public function getSshFtpIpsList()
     {
-        return implode(', ', $this->sshftp_ips);
+        return implode(', ', empty($this->sshftp_ips) ? ['0.0.0.0/0'] : $this->sshftp_ips);
     }
 
     public function getKnownTypes()

diff --git a/src/models/Hdomain.php b/src/models/Hdomain.php
@@ -21,6 +21,12 @@ class Hdomain extends \hipanel\base\Model
      */
     public $vhost;
 
+    /**
+     * @var array Stores array of aliases of hdomain 
+     */
+    public $aliases;
+
+
     /** @inheritdoc */
     public function rules()
     {
@@ -87,6 +93,7 @@ public function attributeLabels()
             'with_www'       => Yii::t('app', 'Create www alias'),
             'proxy_enable'   => Yii::t('app', 'Enable proxy (NEED MANUAL)'),
             'backuping_type' => Yii::t('app', 'Backup periodicity'),
+            'dns_on'         => Yii::t('app', 'DNS'),
         ]);
     }
 

diff --git a/src/models/HdomainSearch.php b/src/models/HdomainSearch.php
@@ -37,6 +37,7 @@ public function searchAttributes()
             'with_request',
             'with_vhosts',
             'with_dns',
+            'show_aliases_only',
         ]);
     }
 }
diff --git a/src/views/account/_search.php b/src/views/account/_search.php
@@ -25,6 +25,15 @@
 <div class="col-md-6">
     <?= $search->field('client_id')->widget(ClientCombo::classname(), ['formElementSelector' => '.form-group']) ?>
     <?= $search->field('seller_id')->widget(SellerCombo::classname(), ['formElementSelector' => '.form-group']) ?>
+    <?= $search->field('type')->widget(StaticCombo::classname(), [
+        'data' => $typeData,
+        'hasId' => true,
+        'pluginOptions' => [
+            'select2Options' => [
+                'multiple' => false,
+            ]
+        ],
+    ]) ?>
 </div>
 
 
diff --git a/src/views/account/index.php b/src/views/account/index.php
@@ -36,7 +36,7 @@
             <?= $box->renderSearchButton() ?>
             <?= $box->renderSorter([
                 'attributes' => [
-                    'login', 'client', 'server', 'state', 'type'
+                    'login', 'client', 'seller', 'server', 'state', 'type'
                 ],
             ]) ?>
             <?= $box->renderPerPage() ?>
@@ -45,7 +45,7 @@
     <?php $box->beginBulkActions() ?>
         <?= $box->renderDeleteButton() ?>
     <?php $box->endBulkActions() ?>
-        <?= $box->renderSearchForm(['stateData' => $stateData]) ?>
+        <?= $box->renderSearchForm(['stateData' => $stateData, 'typeData' => $typeData]) ?>
     <?php $box->end() ?>
 
     <?php $box->beginBulkForm() ?>
@@ -59,6 +59,7 @@
                 'seller',
                 'server',
                 'state',
+                'type',
                 'actions',
             ],
         ]) ?>

diff --git a/src/views/account/view.php b/src/views/account/view.php
@@ -148,4 +148,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/src/views/db/_form.php b/src/views/db/_form.php
@@ -19,7 +19,7 @@
     'enableClientValidation' => true,
     'validateOnBlur'         => true,
     'enableAjaxValidation'   => true,
-    'validationUrl'          => Url::toRoute(['validate-form', 'scenario' => $model->isNewRecord ? reset($models)->scenario : 'update']),
+    'validationUrl'          => Url::toRoute(['validate-form', 'scenario' => $model->isNewRecord ? $model->scenario : 'update']),
 ]) ?>
 
     <div class="container-items"><!-- widgetContainer -->
@@ -52,4 +52,4 @@
 <?= Html::submitButton(Yii::t('app', 'Save'), ['class' => 'btn btn-default']) ?>
     &nbsp;
 <?= Html::button(Yii::t('app', 'Cancel'), ['class' => 'btn btn-default', 'onclick' => 'history.go(-1)']) ?>
-<?php ActiveForm::end();
+<?php ActiveForm::end();
diff --git a/src/views/db/_search.php b/src/views/db/_search.php
@@ -17,7 +17,7 @@
     <?= $search->field('client_id')->widget(ClientCombo::classname(), ['formElementSelector' => '.form-group']) ?>
     <?= $search->field('seller_id')->widget(SellerCombo::classname(), ['formElementSelector' => '.form-group']) ?>
     <?= $search->field('state')->widget(StaticCombo::classname(), [
-        'data' => $state_data,
+        'data' => $stateData,
         'hasId' => true,
         'pluginOptions' => [
             'select2Options' => [

diff --git a/src/views/db/create.php b/src/views/db/create.php
@@ -9,5 +9,5 @@
 ?>
 
 <div class="db-create">
-    <?= $this->render('_form', compact('models')) ?>
+    <?= $this->render('_form', compact('models', 'model')) ?>
 </div>
diff --git a/src/views/db/index.php b/src/views/db/index.php
@@ -16,7 +16,7 @@
         <?= $box->renderSearchButton(); ?>
         <?= $box->renderSorter([
             'attributes' => [
-                'client', 'account', 'server', 'name', 'description', 'state'
+                'client', 'seller', 'account', 'server', 'name', 'description', 'state'
             ],
         ]) ?>
         <?= $box->renderPerPage() ?>