From 0b559f8acb968fa739f452d7dcb8a29aa2000148 Mon Sep 17 00:00:00 2001 From: LeJeanbono Date: Tue, 6 Oct 2020 23:09:16 +0200 Subject: [PATCH 1/2] Rename CPU Threads for CPU Pinning --- resources/views/admin/servers/new.blade.php | 2 +- resources/views/admin/servers/view/build.blade.php | 2 +- resources/views/admin/servers/view/index.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/admin/servers/new.blade.php b/resources/views/admin/servers/new.blade.php index c11f4cc7c..1b74610d0 100644 --- a/resources/views/admin/servers/new.blade.php +++ b/resources/views/admin/servers/new.blade.php @@ -158,7 +158,7 @@
- +
diff --git a/resources/views/admin/servers/view/build.blade.php b/resources/views/admin/servers/view/build.blade.php index c1f8defca..e79c323da 100644 --- a/resources/views/admin/servers/view/build.blade.php +++ b/resources/views/admin/servers/view/build.blade.php @@ -38,7 +38,7 @@

Each physical core on the system is considered to be 100%. Setting this value to 0 will allow a server to use CPU time without restrictions.

- +
diff --git a/resources/views/admin/servers/view/index.blade.php b/resources/views/admin/servers/view/index.blade.php index b8c17fb01..0a563db3f 100644 --- a/resources/views/admin/servers/view/index.blade.php +++ b/resources/views/admin/servers/view/index.blade.php @@ -68,7 +68,7 @@ - CPU Threads + CPU Pinning @if($server->threads != null) {{ $server->threads }} From c8b00f0ccf82b19717351c69f8b471af374eb21a Mon Sep 17 00:00:00 2001 From: Charles Morgan Date: Sun, 11 Oct 2020 04:35:26 -0400 Subject: [PATCH 2/2] Fix missing semi, Fixed task tow overflow Was suppsoe to be correct in https://github.com/pterodactyl/panel/pull/2352 but seems to be picky. Should now correctly show a multiline text box and not a long skinny text box when the text overflows. Also, fixed a missing semicolon. :+1: --- resources/scripts/components/server/PowerControls.tsx | 2 +- .../scripts/components/server/schedules/ScheduleTaskRow.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/scripts/components/server/PowerControls.tsx b/resources/scripts/components/server/PowerControls.tsx index e21669f54..e88ffe3f0 100644 --- a/resources/scripts/components/server/PowerControls.tsx +++ b/resources/scripts/components/server/PowerControls.tsx @@ -49,7 +49,7 @@ const PowerControls = () => { sendPowerCommand(action)}/>
- ) + ); }; export default PowerControls; diff --git a/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx b/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx index c81fb48d6..c79fafd03 100644 --- a/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx +++ b/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx @@ -81,7 +81,7 @@ export default ({ schedule, task }: Props) => {
{task.action === 'backup' &&

Ignoring files & folders:

} -
+
{task.payload}