fixes after redoing hiart

hiqdev · Jan 24, 2017 · 2308604 · 2308604
1 parent 1974f5d
commit 2308604
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/controllers/ServerController.php b/src/controllers/ServerController.php
@@ -384,7 +384,7 @@ public function getVNCInfo($model, $enable = false)
         $vnc = ['endTime' => strtotime('+8 hours', strtotime($model->statuses['serverEnableVNC']))];
         if ($model->canEnableVnc() && $vnc['endTime'] > time() || $enable) {
             try {
-                $vnc = ArrayHelper::merge($vnc, Server::perform('EnableVNC', ['id' => $model->id]));
+                $vnc = ArrayHelper::merge($vnc, Server::perform('enable-VNC', ['id' => $model->id]));
                 $vnc['enabled'] = true;
             } catch (ErrorResponseException $e) {
                 if ($e->getMessage() !== 'vds_has_tasks') { // expected error, that could be skipped

diff --git a/src/models/Server.php b/src/models/Server.php
@@ -208,7 +208,7 @@ public function getUses()
 
     public function getIps()
     {
-        return $this->hasMany(Ip::class, ['device_id' => 'id'])->join('links');
+        return $this->hasMany(Ip::class, ['device_id' => 'id'])->joinWith('links');
     }
 
     /**