From 8ddfd4893ffd0730fa3cdadf451045b6871c4d85 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Mon, 30 May 2022 01:13:15 +0200 Subject: [PATCH] Show Progress column only on MariaDB Signed-off-by: Liviu-Mihail Concioiu --- libraries/classes/Server/Status/Processes.php | 16 ++++++++++------ templates/server/status/processes/list.twig | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php index 19b9b26a17..7af9f34f39 100644 --- a/libraries/classes/Server/Status/Processes.php +++ b/libraries/classes/Server/Status/Processes.php @@ -133,14 +133,18 @@ final class Processes 'column_name' => __('Status'), 'order_by_field' => 'State', ], - [ + ]; + + if ($this->dbi->isMariaDB()) { + $sortableColumns[] = [ 'column_name' => __('Progress'), 'order_by_field' => 'Progress', - ], - [ - 'column_name' => __('SQL query'), - 'order_by_field' => 'Info', - ], + ]; + } + + $sortableColumns[] = [ + 'column_name' => __('SQL query'), + 'order_by_field' => 'Info', ]; $sortableColCount = count($sortableColumns); diff --git a/templates/server/status/processes/list.twig b/templates/server/status/processes/list.twig index 9a36b31485..44ed19769a 100644 --- a/templates/server/status/processes/list.twig +++ b/templates/server/status/processes/list.twig @@ -75,7 +75,9 @@ {{ row.command }} {{ row.time }} {{ row.state }} - {{ row.progress }} + {% if is_mariadb %} + {{ row.progress }} + {% endif %} {{ row.info|raw }} {% endfor %}