server/view - fixed loading of huge data

hiqdev · Jan 25, 2016 · 033ba81 · 033ba81
1 parent 4167fd2
commit 033ba81
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/controllers/ServerController.php b/src/controllers/ServerController.php
@@ -19,6 +19,7 @@
 use hipanel\base\CrudController;
 use hipanel\models\Ref;
 use hipanel\modules\finance\controllers\TariffController;
+use hipanel\modules\finance\models\Tariff;
 use hipanel\modules\server\models\Osimage;
 use hipanel\modules\server\models\Server;
 use Yii;
@@ -59,13 +60,19 @@ public function actions()
                     $model->vnc = $controller->getVNCInfo($model);
 
                     $panels = $controller->getPanelTypes();
-                    $tariff = TariffController::findModel([
+                    $tariff = Tariff::find()->where([
                         'id' => $model->tariff_id,
                         'show_final' => true,
                         'show_deleted' => true,
                         'with_resources' => true,
-                    ]);
-                    $ispSupported = !empty($tariff['resources']['isp']['quantity']);
+                    ])->joinWith('resources')->one();
+
+                    $ispSupported = false;
+                    foreach ($tariff->getResources() as $resource) {
+                        if ($resource->type === 'isp' && $resource->quantity > 0) {
+                            $ispSupported = true;
+                        }
+                    }
 
                     $osimages = $controller->getOsimages($model);
                     $grouped_osimages = $controller->getGroupedOsimages($osimages, $ispSupported);