From e7fb989205a9f391fc22f0c1f5eabfe17d8c8447 Mon Sep 17 00:00:00 2001
From: Davide Franco <bacula-dev@dflc.ch>
Date: Mon, 27 Jun 2011 16:04:29 +0200
Subject: [PATCH] bacula-web: Fixed job fields in index template

 - Improved db error exception in index.php
---
 gui/bacula-web/index.php           | 3 ++-
 gui/bacula-web/templates/index.tpl | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index 15a66510b3..dea1accf2e 100644
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -117,6 +117,7 @@ $graph->SetYTitle( "GB" );
 $graph->Render();
 $dbSql->tpl->assign('graph_stored_bytes', $graph->Get_Image_file() );
 
+
 // Last 15 used volumes
 $vol_list = array();
 
@@ -129,7 +130,7 @@ $query .= "LIMIT 10 ";
 $result = $dbSql->db_link->query( $query );
 
 if ( PEAR::isError( $result ) )
-	die( "Unable to get last used volumes from catalog \n " . $result->getMessage() );
+	$this->TriggerDBError( 'Unable to get last used volumes from catalog' . $result );
 else {
 	while ( $vol = $result->fetchRow() ) 
 		array_push( $vol_list, $vol );
diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index 1a7d9d04fb..8f7560c9c1 100644
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -50,10 +50,10 @@
 		</tr>
 		{foreach from=$volume_list item=vol}
 		<tr>
-		  <td>{$vol.Volumename}</td>
-		  <td>{$vol.VolStatus}</td>
-		  <td>{$vol.Lastwritten}</td>
-		  <td>{$vol.JobId}</td>
+		  <td>{$vol.volumename}</td>
+		  <td>{$vol.volstatus}</td>
+		  <td>{$vol.lastwritten}</td>
+		  <td>{$vol.jobid}</td>
 		</tr>
 		{/foreach}
 	  </table>
-- 
2.39.5