ebl Add a "Display only Errors/Warning" button to job zoom

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

diff --git a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
index 9259ecdb6a7c2c240589b6e1f4cd9373bd5fbca6..a464fa1f5b184b66162c53917b0d7c28307fe097 100644 (file)
--- a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
@@ -79,6 +79,13 @@
   </label>
  </form>
  </td>
+<TMPL_IF joberrors>
+ <td>
+    <a href="<TMPL_VAR thisurl>;error=1"
+         title="Voir seulement les erreurs">
+    <img src='/bweb/doc.png' alt="Voir les erreurs"></a> Voir les erreurs
+  </td>
+</TMPL_IF>
  </table>
 </div>
 

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index d63b9504c82b42ecc219e76ce6f46e8670fb8591..65da7f806135e565d34fe28fbd2a1f3dd639f216 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -3340,6 +3340,12 @@ sub get_job_log
 
     my $t = CGI::param('time') || $self->{info}->{display_log_time} || '';
 
+    # display only Error and Warning messages
+    my $filter = '';
+    if (CGI::param('error')) {
+       $filter = " AND LogText $self->{sql}->{MATCH} 'Error|Warning' ";
+    }
+
     my $query = "
 SELECT Job.Name as name, Client.Name as clientname
  FROM  Job INNER JOIN Client ON (Job.ClientId = Client.ClientId)
@@ -3355,10 +3361,11 @@ SELECT Job.Name as name, Client.Name as clientname
     $query = "
 SELECT Time AS time, LogText AS log 
   FROM  Log 
- WHERE Log.JobId = $arg->{jobid} 
+ 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})
        )
+       ) $filter
  ORDER BY LogId
  LIMIT $arg->{limit}
  OFFSET $arg->{offset}

diff --git a/gui/bweb/tpl/display_job_zoom.tpl b/gui/bweb/tpl/display_job_zoom.tpl
index a9b30f386a47226aca979b164202724b48a68bf9..78f15058927a6cc05aba9309eac0bd274ca135c5 100644 (file)
--- a/gui/bweb/tpl/display_job_zoom.tpl
+++ b/gui/bweb/tpl/display_job_zoom.tpl
@@ -77,6 +77,13 @@
   </label>
  </form>
  </td>
+<TMPL_IF joberrors>
+ <td>
+    <a href="<TMPL_VAR thisurl>;error=1"
+         title="View only errors">
+    <img src='/bweb/doc.png' alt="view errors"></a> View only errors
+  </td>
+</TMPL_IF>
  </table>
 </div>