ebl if use bconsole.pl, discard scp:// file://

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

diff --git a/gui/brestore/brestore-fr.glade b/gui/brestore/brestore-fr.glade
index 9b12d6a7f1dc8bac97eb1c4c3b4e15745a5f96d9..7ed8a7f527084cf46707a329ed594563685eea90 100644 (file)
--- a/gui/brestore/brestore-fr.glade
+++ b/gui/brestore/brestore-fr.glade
@@ -1874,8 +1874,7 @@ Ou, si le director est sur une autre machine :
 <b> scp://bacula@hostdir:/path/to/bsr </b>
 
 Ou si le director fonctionne avec le connecteur http bweb
-<b> file://var/tmp</b>
-Et vous devez positionner bconsole sur
+vous devez laisser ce champs vide, et vous devez positionner bconsole sur
 &lt;b&gt; http://user:pass@director/cgi-bin/bweb/bconsole.pl&lt;/b&gt;</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">True</property>

diff --git a/gui/brestore/brestore.glade b/gui/brestore/brestore.glade
index 3f8c00ac6968d1145155d694f114b60363ff28fd..b32a8e693eb68c3c538c530463ad868dc767ae54 100644 (file)
--- a/gui/brestore/brestore.glade
+++ b/gui/brestore/brestore.glade
@@ -1871,15 +1871,14 @@ Example : DBI:Pg:database=bacula;host=127.0.0.1;port=5432
                              <property name="label" translatable="yes">To launch a restore job, bacula need a BSR file.
 This file must be &lt;b&gt;local&lt;/b&gt; to director, so
 
-if director is local, put something like : 
+if the director is local, put something like : 
 &lt;b&gt; file://path/to/bacula/work/dir&lt;/b&gt;
 or if director is on other host
 &lt;b&gt; scp://bacula@hostdir:/path/to/bsr &lt;/b&gt;
 
-or if director works with the bweb http connector
-&lt;b&gt; file://var/tmp&lt;/b&gt;
-and set bconsole to 
-&lt;b&gt; http://user:pass@director/cgi-bin/bweb/brestore.pl&lt;/b&gt;</property>
+or if the director works with the bweb http connector
+keep it empty and set bconsole to
+&lt;b&gt; http://user:pass@director/cgi-bin/bweb/bconsole.pl&lt;/b&gt;</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">True</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>

diff --git a/gui/brestore/brestore.pl b/gui/brestore/brestore.pl
index 72ed665299aac681a38a139415c48e57628e078b..66319e15cb36f0e3f45ce4715df812df9ec883ff 100755 (executable)
--- a/gui/brestore/brestore.pl
+++ b/gui/brestore/brestore.pl
@@ -424,6 +424,8 @@ sub show_job
 
     my $ret = $self->{pref}->go_bweb("?action=dsp_cur_job;jobid=$jobid;client=$client", "view job status");
 
+    $self->on_cancel_resto_clicked();
+
     if ($ret == -1) {
        my $widget = Gtk2::MessageDialog->new(undef, 'modal', 'info', 'close', 
 "Your job have been submited to bacula.
@@ -431,8 +433,6 @@ To follow it, you must use bconsole (or install/configure bweb)");
        $widget->run;
        $widget->destroy();
     }
-
-    $self->on_cancel_resto_clicked();
 }
 
 sub on_cancel_resto_clicked
@@ -541,6 +541,10 @@ sub copy_bsr
     print "$src => $dst\n"
        if ($debug);
 
+    if (!$dst) {
+        return $src;
+    }
+
     my $ret=0 ;
     my $err ; 
     my $dstfile;