Update JobModel.php

Add an id to each joblog entry to fix the sorting problem on the details page.
bareos · May 8, 2020 · eda19fc · eda19fc
1 parent ed49f36
commit eda19fc
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/webui/module/Job/src/Job/Model/JobModel.php b/webui/module/Job/src/Job/Model/JobModel.php
@@ -175,6 +175,7 @@ public function getJobLog(&$bsock=null, $id=null)
          $cmd = 'list joblog jobid='.$id.'';
          $limit = 1000;
          $offset = 0;
+         $id = 1;
          $retval = array();
          while (true) {
             $result = $bsock->send_command($cmd . ' limit=' . $limit . ' offset=' . $offset, 2);
@@ -190,6 +191,9 @@ public function getJobLog(&$bsock=null, $id=null)
                if ( empty($log['result']['joblog']) && $log['result']['meta']['range']['filtered'] === 0 ) {
                   return $retval;
                } else {
+                  foreach($log['result']['joblog'] as &$joblog) {
+                     $joblog["id"] = $id++;
+                  }
                   $retval = array_merge($retval, $log['result']['joblog']);
                }
             }