Merge branch 'develop' into cputhreads

2020-04-03 13:48:06 -07:00 · 2020-04-03 13:48:06 -07:00 · 78d6e59fc5
commit 78d6e59fc5
parent 71292a7642 7d45379f31
31 changed files with 1883 additions and 1323 deletions
--- a/app/Http/Requests/Api/Client/Servers/SendPowerRequest.php
+++ b/app/Http/Requests/Api/Client/Servers/SendPowerRequest.php
@ -18,11 +18,10 @@ class SendPowerRequest extends ClientApiRequest
            case 'start':
                return Permission::ACTION_CONTROL_START;
            case 'stop':
+            case 'kill':
                return Permission::ACTION_CONTROL_STOP;
            case 'restart':
                return Permission::ACTION_CONTROL_RESTART;
-            case 'kill':
-                return Permission::ACTION_CONTROL_KILL;
        }

        return '__invalid';