From 0cad2b93622153e86e1f328489611753bfa4e405 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Mon, 13 Apr 2020 18:11:45 -0400 Subject: [PATCH] Update Admin Overview for server Changes CPU Threads show Not Set instead of n/a Changes 0% -> Unlimited, when cpu is set to 0(unlimited) Changes 0MB -> Unlimited, when memory is set to 0(unlimited) Changes 0MB Swap -> Not Set Changes -1 Swap -> Unlimited Changes Name -> Server Name Changes Service -> Current Egg --- .../views/admin/servers/view/index.blade.php | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/resources/views/admin/servers/view/index.blade.php b/resources/views/admin/servers/view/index.blade.php index 23c8e42e0..637c9bd33 100644 --- a/resources/views/admin/servers/view/index.blade.php +++ b/resources/views/admin/servers/view/index.blade.php @@ -47,19 +47,25 @@ {{ $server->uuid }} - Service + Current Egg {{ $server->nest->name }} :: {{ $server->egg->name }} - Name + Server Name {{ $server->name }} CPU Limit - {{ $server->cpu }}% + + @if($server->cpu === 0) + Unlimited + @else + {{ $server->cpu }}% + @endif + CPU Threads @@ -67,13 +73,27 @@ @if($server->threads != null) {{ $server->threads }} @else - n/a + Not Set @endif Memory - {{ $server->memory }}MB / {{ $server->swap }}MB + + @if($server->memory === 0) + Unlimited + @else + {{ $server->memory }}MB + @endif + / + @if($server->swap === 0) + Not Set + @elseif($server->swap === -1) + Unlimited + @else + {{ $server->swap }}MB + @endif + Disk Space