Forráskód Böngészése

finish using console button

andre 4 éve
szülő
commit
e2557afdb2

+ 1 - 5
app/UI/Vms/Buttons/ConsoleButton.php

@@ -35,11 +35,7 @@ class ConsoleButton extends ButtonDataTableModalAction implements ClientArea
     {
     {
         $this->initIds('consoleButton');
         $this->initIds('consoleButton');
         $this->setDisableByColumnValue("vmid", 0);
         $this->setDisableByColumnValue("vmid", 0);
-        if(isAdmin()){
-            $url = BuildUrl::getSelfUrl() . '&mg-action=novncs';
-        } else {
-            $url = "clientarea.php?action=productdetails&id={$this->getWhmcsParamByKey('serviceid')}&modop=custom&a=management&mg-page=console&mg-action=novnc";
-        }
+        $url = "clientarea.php?action=productdetails&id={$this->getWhmcsParamByKey('serviceid')}&modop=custom&a=management&mg-page=console&mg-action=novnc";
         $this->setRawUrl($url)
         $this->setRawUrl($url)
             ->setRedirectParams(['vm' => ':id']);
             ->setRedirectParams(['vm' => ':id']);
     }
     }

+ 1 - 1
app/UI/Vms/Pages/VmsDataTable.php

@@ -83,7 +83,7 @@ class VmsDataTable extends DataTable implements ClientArea, AdminArea
             //migrate
             //migrate
             $this->addActionButton(new MigrateButton());
             $this->addActionButton(new MigrateButton());
         }
         }
-        if (isAdmin() || $this->configuration()->isPermissionNovnc()){
+        if (!isAdmin() && $this->configuration()->isPermissionNovnc()){
             //console
             //console
             $this->addActionButton(new ConsoleButton());
             $this->addActionButton(new ConsoleButton());
         }
         }