From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 7 Jun 2023 08:18:22 +0000 (+0200)
Subject: baculum: Add sorting by joberrors if sorted by jobstatus first
X-Git-Tag: Release-13.0.4~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=082d8a78d288aca6528c5e8ed7139b2dbd33ad2e;p=thirdparty%2Fbacula.git

baculum: Add sorting by joberrors if sorted by jobstatus first
---

diff --git a/gui/baculum/protected/API/Modules/JobManager.php b/gui/baculum/protected/API/Modules/JobManager.php
index f6e2d7a13..ca9fdb760 100644
--- a/gui/baculum/protected/API/Modules/JobManager.php
+++ b/gui/baculum/protected/API/Modules/JobManager.php
@@ -212,7 +212,12 @@ LEFT JOIN FileSet USING (FilesetId)'
 			if ($db_params['type'] === Database::PGSQL_TYPE) {
 			    $sort_col = strtolower($sort_col);
 			}
-			$order = ' ORDER BY ' . $sort_col . ' ' . strtoupper($sort_order);
+			$sorder = strtoupper($sort_order);
+			$order = ' ORDER BY ' . $sort_col . ' ' . $sorder;
+
+			if ($sort_col == 'jobstatus') {
+				$order .= ',joberrors ' . $sorder;
+			}
 
 			// create temporary table
 			$jobid_jobstatus_tname = 'jobid_jobstatus_' . getmypid();