]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Add sorting by joberrors if sorted by jobstatus first
authorMarcin Haba <marcin.haba@bacula.pl>
Wed, 7 Jun 2023 08:18:22 +0000 (10:18 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Mon, 3 Jul 2023 08:46:57 +0000 (10:46 +0200)
gui/baculum/protected/API/Modules/JobManager.php

index f6e2d7a137f2551fc1319198e0cba3790aa61f64..ca9fdb7608ab3c7c372782c661261b90907e5996 100644 (file)
@@ -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();