From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 14 Nov 2006 23:04:46 +0000 (+0000)
Subject: ebl  add deamon message to log view
X-Git-Tag: Release-2.0.0~292
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=838cd9cfe0e586f9eef22c333cd1fb382dde3adf;p=bacula%2Fbacula

ebl  add deamon message to log view


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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 5e91bbb7b2..41a5ddfa38 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -2897,10 +2897,15 @@ SELECT Job.Name as name, Client.Name as clientname
 
     $query = "
 SELECT Time AS time, LogText AS log
- FROM  Log
- WHERE JobId = $arg->{jobid}
+ 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())
+       )
  ORDER BY LogId
 ";
+
     my $log = $self->dbh_selectall_arrayref($query);
     unless ($log) {
 	return $self->error("Can't get log for jobid $arg->{jobid}");