Minor refactors

hiqdev · Feb 26, 2016 · 1e1d52e · 1e1d52e
1 parent 6b271a9
commit 1e1d52e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 23 deletions.
diff --git a/src/controllers/ServerController.php b/src/controllers/ServerController.php
@@ -20,14 +20,13 @@
 use hipanel\models\Ref;
 use hipanel\modules\finance\models\Tariff;
 use hipanel\modules\server\helpers\ServerHelper;
-use hipanel\modules\server\models\ConsumptionForm;
 use hipanel\modules\server\models\Osimage;
 use hipanel\modules\server\models\Server;
-use hipanel\modules\server\models\ServerSearch;
 use hipanel\modules\server\models\ServerUseSearch;
 use Yii;
 use yii\base\Event;
 use yii\helpers\ArrayHelper;
+use yii\helpers\VarDumper;
 use yii\web\NotFoundHttpException;
 
 class ServerController extends CrudController
@@ -52,7 +51,7 @@ public function actions()
                 ]
             ],
             'view' => [
-                'class'       => ViewAction::class,
+                'class' => ViewAction::class,
                 'on beforePerform' => function (Event $event) {
                     /** @var \hipanel\actions\SearchAction $action */
                     $action = $event->sender;
@@ -67,7 +66,7 @@ public function actions()
                         ->andWhere(['with_uses' => 1])
                         ->select(['*']);
                 },
-                'data'        => function ($action) {
+                'data' => function ($action) {
                     /**
                      * @var $controller $this
                      * @var $model Server
@@ -105,7 +104,14 @@ public function actions()
 
                     $blockReasons = $controller->getBlockReasons();
 
-                    return compact(['model', 'osimages', 'osimageslivecd', 'grouped_osimages', 'panels', 'blockReasons']);
+                    return compact([
+                        'model',
+                        'osimages',
+                        'osimageslivecd',
+                        'grouped_osimages',
+                        'panels',
+                        'blockReasons'
+                    ]);
                 },
             ],
             'requests-state' => [
@@ -268,8 +274,6 @@ public function actionDrawChart()
         $dataProvider = $searchModel->search([]);
         $dataProvider->pagination = false;
         $dataProvider->query->options = ['scenario' => 'get-uses'];
-        $dataProvider->query->index = 'servers';
-        $dataProvider->query->type = 'server';
         $dataProvider->query->andWhere($post);
         $models = $dataProvider->getModels();
 
@@ -326,7 +330,8 @@ protected function getPanelTypes()
 
     protected function getStates()
     {
-        return Ref::getList('state,device');
+        $states = Ref::getList('state,device');
+        return $states;
     }
 
     /**

diff --git a/src/models/ServerUse.php b/src/models/ServerUse.php
@@ -15,6 +15,21 @@ class ServerUse extends RUse
 {
     use \hipanel\base\ModelTrait;
 
+    public function formName()
+    {
+        return 'ServerUse';
+    }
+
+    public static function index()
+    {
+        return 'servers';
+    }
+
+    public static function type()
+    {
+        return 'server';
+    }
+
     private function getTrafficTypes()
     {
         return ['server_traf_in', 'server_traf_max', 'server_traf'];

diff --git a/src/models/ServerUseSearch.php b/src/models/ServerUseSearch.php
@@ -14,19 +14,4 @@
 class ServerUseSearch extends ServerUse
 {
     use \hipanel\base\SearchModelTrait;
-
-    public function formName()
-    {
-        return 'ServerUse';
-    }
-
-    public static function index()
-    {
-        return 'Servers';
-    }
-
-    public static function type()
-    {
-        return 'Server';
-    }
 }