]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Fix using offset in job file list query with MySQL catalog database
authorMarcin Haba <marcin.haba@bacula.pl>
Wed, 28 Oct 2020 05:56:54 +0000 (06:56 +0100)
committerMarcin Haba <marcin.haba@bacula.pl>
Wed, 28 Oct 2020 05:56:54 +0000 (06:56 +0100)
gui/baculum/protected/API/Class/JobManager.php

index 636ef7bc77050959c1f439a46c295f40a1342980..f0abf6eb59e8e3e2d3907465a8a6c6f68d46e78d 100644 (file)
@@ -329,16 +329,16 @@ WHERE Client.ClientId='$clientid' $jobs_criteria";
                        $fname_col = 'CONCAT(Path.Path, Filename.Name)';
                }
 
-               $offset_sql = '';
-               if ($offset) {
-                       $offset_sql = ' OFFSET ' . $offset;
-               }
-
                $limit_sql = '';
                if ($limit) {
                        $limit_sql = ' LIMIT ' . $limit;
                }
 
+               $offset_sql = '';
+               if ($offset) {
+                       $offset_sql = ' OFFSET ' . $offset;
+               }
+
                $sql = "SELECT $fname_col  AS file, 
                                F.lstat     AS lstat, 
                                F.fileindex AS fileindex 
@@ -365,7 +365,7 @@ WHERE Client.ClientId='$clientid' $jobs_criteria";
                         WHERE Filename.FilenameId=F.FilenameId 
                         AND Path.PathId=F.PathId 
                         $search_crit 
-                       $offset_sql $limit_sql";
+                       $limit_sql $offset_sql";
                $connection = JobRecord::finder()->getDbConnection();
                $connection->setActive(true);
                $pdo = $connection->getPdoInstance();