ebl Display system log with Job log

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3658 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index b7ffb38850f75fe603c699de29b086b65ac3f0f8..d60d266cfeb1082b354a34e99ccac6969cee8e65 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -2925,14 +2925,13 @@ SELECT Job.Name as name, Client.Name as clientname
     }
 
     $query = "
-SELECT Time AS time, LogText AS log
- FROM  Log INNER JOIN Job ON (Job.JobId = Log.JobId)
- WHERE Log.JobId = $arg->{jobid}
-    OR (    Log.JobId = 0 
-        AND Log.Time >= Job.StartTime
-        AND Log.Time <= COALESCE(Job.EndTime, Now())
+SELECT Time AS time, LogText AS log 
+  FROM  Log 
+ WHERE Log.JobId = $arg->{jobid} 
+    OR (Log.JobId = 0 AND Time >= (SELECT StartTime FROM Job WHERE JobId=$arg->{jobid}) 
+                      AND Time <= (SELECT COALESCE(EndTime,NOW()) FROM Job WHERE JobId=$arg->{jobid})
        )
- ORDER BY LogId
+ ORDER BY LogId;
 ";
 
     my $log = $self->dbh_selectall_arrayref($query);