From 3cb04849377e2006982e6224ce77137db13e9d0e Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 24 Aug 2007 05:39:45 +0000
Subject: [PATCH] Show more details in restore job menu

---
 bacula-backup/lang/en          | 3 +++
 bacula-backup/restore_form.cgi | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bacula-backup/lang/en b/bacula-backup/lang/en
index d552a7f50..0da2d7853 100644
--- a/bacula-backup/lang/en
+++ b/bacula-backup/lang/en
@@ -638,3 +638,6 @@ restore_eclients=No members of Bacula group backup found!
 restore_eall1=The <b>All Clients in Backup</b> option must be selected for <b>Restore to client or group</b> when doing a Bacula group job restore
 restore_eall2=The <b>All Clients in Backup</b> option can only be selected for <b>Restore to client or group</b> when doing a Bacula group job restore
 restore_enofiles=None of the selected files are in the backup
+restore_level_F=Full
+restore_level_D=Differential
+restore_level_I=Incremental
diff --git a/bacula-backup/restore_form.cgi b/bacula-backup/restore_form.cgi
index fad83d5a7..96c76e9ad 100755
--- a/bacula-backup/restore_form.cgi
+++ b/bacula-backup/restore_form.cgi
@@ -13,18 +13,19 @@ print &ui_table_start($text{'restore_header'}, undef, 2);
 
 # Old job to restore
 $dbh = &connect_to_database();
-$cmd = $dbh->prepare("select JobId,Name,SchedTime from Job where Name not like 'Restore%' order by SchedTime desc") ||
+$cmd = $dbh->prepare("select JobId,Name,SchedTime,Level from Job where Name not like 'Restore%' order by SchedTime desc") ||
                 &error("prepare failed : ",$dbh->errstr);
 $cmd->execute();
-while(my ($id, $name, $when) = $cmd->fetchrow()) {
+while(my ($id, $name, $when, $level) = $cmd->fetchrow()) {
+	$level = $text{'restore_level_'.$level} || $level;
 	($j, $c) = &is_oc_object($name);
 	if (!$j) {
 		# Normal backup
-		push(@opts, [ $id, "$name ($when)" ]);
+		push(@opts, [ $id, "$id - $name ($when) - $level" ]);
 		}
 	elsif ($j && $c) {
 		# Backup of one node
-		push(@opts, [ $id, "$j on $c ($when)" ]);
+		push(@opts, [ $id, "$id - $j on $c ($when) - $level" ]);
 
 		# Save the job ID to a list of those for this particular node
 		# group backup