Added combo2 for Acctount, DbService, Service

Db Deep coding
hiqdev · Apr 23, 2015 · 94dd965 · 94dd965
1 parent bbcab8d
commit 94dd965
Show file tree

Hide file tree

Showing 5 changed files with 151 additions and 12 deletions.
diff --git a/assets/combo2/Account.php b/assets/combo2/Account.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace hipanel\modules\hosting\assets\combo2;
+
+use hipanel\widgets\Combo2Config;
+use yii\helpers\ArrayHelper;
+
+/**
+ * Class Account
+ */
+class Account extends Combo2Config
+{
+    /** @inheritdoc */
+    public $type = 'account';
+
+    /** @inheritdoc */
+    public $_primaryFilter = 'login_like';
+
+    /** @inheritdoc */
+    public $url = '/hosting/account/search';
+
+    public $_return = ['id', 'client', 'client_id', 'device', 'device_id'];
+
+    public $_rename = ['text' => 'login'];
+
+    public $_filter = [
+        'client' => 'client',
+        'server' => 'server'
+    ];
+
+    /** @inheritdoc */
+    function getConfig ($config = []) {
+        $config = ArrayHelper::merge([
+            'clearWhen'     => ['client', 'server'],
+            'affects'       => [
+                'client' => 'client',
+                'server' => 'device'
+            ]
+        ], $config);
+
+        return parent::getConfig($config);
+    }
+}
diff --git a/assets/combo2/DbService.php b/assets/combo2/DbService.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace hipanel\modules\hosting\assets\combo2;
+
+/**
+ * Class DbService
+ */
+class DbService extends Service {
+    /** @inheritdoc */
+    public $type = 'dbService';
+
+    /** @inheritdoc */
+    public $softType = 'db';
+
+}
diff --git a/assets/combo2/Service.php b/assets/combo2/Service.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace hipanel\modules\hosting\assets\combo2;
+use hipanel\widgets\Combo2Config;
+use yii\helpers\ArrayHelper;
+
+
+/**
+ * Class Service
+ */
+class Service extends Combo2Config
+{
+    /** @inheritdoc */
+    public $type = 'service';
+
+    /** @inheritdoc */
+    public $_primaryFilter = 'name_like';
+
+    /** @inheritdoc */
+    public $url = '/hosting/service/search';
+
+    /** @inheritdoc */
+    public $_return = ['id', 'client', 'client_id', 'device', 'device_id', 'seller', 'seller_id'];
+
+    /** @inheritdoc */
+    public $_rename = ['text' => 'name'];
+
+    /** @inheritdoc */
+    public $_filter = [
+        'client' => 'client',
+        'server' => 'server'
+    ];
+
+    public $softType;
+
+    /** @inheritdoc */
+    function getConfig ($config = []) {
+        $config = ArrayHelper::merge([
+            'affects' => [
+                'seller' => 'seller',
+                'client' => 'client',
+                'server' => 'device'
+            ],
+            'activeWhen' => [
+                'server'
+            ]
+        ], $config);
+
+        return parent::getConfig($config);
+    }
+
+    /** @inheritdoc */
+    public function getFilter () {
+        return ArrayHelper::merge(parent::getFilter(), [
+            'soft_type' => ['format' => $this->softType]
+        ]);
+    }
+}
diff --git a/controllers/AccountController.php b/controllers/AccountController.php
@@ -7,6 +7,11 @@
 
 namespace hipanel\modules\hosting\controllers;
 
+use hipanel\modules\hosting\models\Account;
+use Yii;
+use yii\base\Response;
+use yii\web\NotFoundHttpException;
+
 class AccountController extends \hipanel\base\CrudController
 {
     public function actionCreateFtp () {
@@ -34,7 +39,7 @@ public function actionSetPassword ($id) {
         if ($model->load(Yii::$app->request->post()) && $model->validate() && $model->save()) {
             Yii::$app->getSession()->addFlash('success', [
                 'title' => $model->login,
-                'text'  => \Yii::t('app', 'Password changing task has been successfully added to queue'),
+                'text'  => Yii::t('app', 'Password changing task has been successfully added to queue'),
             ]);
 
             return $this->redirect(['view', 'id' => $model->id]);
@@ -46,7 +51,7 @@ public function actionSetPassword ($id) {
 
     /**
      * @param $id
-     * @return string|yii\web\Response
+     * @return string|Response
      * @throws NotFoundHttpException
      */
     public function actionSetAllowedIps ($id) {

diff --git a/controllers/DBController.php b/controllers/DBController.php
@@ -26,12 +26,25 @@ public function behaviors () {
     }
 
     public function actionCreate () {
-        $model = new Db(['scenario' => 'create']);
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id]);
-        }
+        $model = $this->newModel(['scenario' => 'create']);
+
+        return $this->perform([
+            'success' => [
+                'result' => [
+                    'POST html' => ['redirect', function ($m) { return $m->id; }, 'addFlash' => true],
+                    'POST pjax' => [
+                        'action',
+                        ['view', function ($m) { return $m->id; }],
+                        'setUrl'   => function ($m) { return ['view', 'id' => $m->id]; },
+                        'addFlash' => true
+                    ]
+                ]
+            ],
+            'result'  => [
+                'GET html' => ['render', ['create', ['model' => $model]]]
+            ],
+        ]);
 
-        return $this->render('create', ['model' => $model]);
     }
 
     public function actionDelete () {
@@ -61,7 +74,7 @@ public function actionDelete () {
     public function actionSetPassword () {
         return $this->perform([
             'result' => [ ///
-                'POST pjax' => ['action', ['view', function ($model) { return ['id' => $model->id]; }], 'addFlash' => true]
+                          'POST pjax' => ['action', ['view', function ($model) { return ['id' => $model->id]; }], 'addFlash' => true]
             ],
         ]);
     }
@@ -75,10 +88,15 @@ public function actionTruncate () {
                 'message' => Yii::t('app', 'Error while truncating DB'),
             ],
             'result'   => [
-                'pjax' => [
-                    'action',
-                    ['view', function ($model) { return ['id' => $model->id]; }],
-                ]
+                'pjax'       => ['action', ['view', function ($model) { return ['id' => $model->id]; }]],
+                'html'       => ['render', ['create', function ($model) { return ['id' => $model->id]; }]],
+                'html2'      => ['render', ['create', ['id']]],
+                'POST html'  => ['redirect', ['create']],
+                'POST html1' => ['redirect', function ($model) { return ['view', 'id' => $model->id]; }],
+                'POST html2' => ['redirect', ['view', ['id']]],
+                'POST html3' => ['return'],
+                'POST html4' => ['renderJson'],
+                'POST html5' => ['custom',],
             ],
             'addFlash' => true
         ]);