bacula-web: Fixed job fields in index template

 - Improved db error exception in index.php

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index 15a66510b39915c7694f376c37dedbcb402ea508..dea1accf2ee8722ac4fef63cfd07fc34f98c1891 100644 (file)
--- 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 1a7d9d04fba0e018d15438df5d29370d8729fd8e..8f7560c9c17466c223d494e824e1873f9b26d608 100644 (file)
--- 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>