From: Dirk H Bartley <dbartley@schupan.com>
Date: Mon, 14 May 2007 01:19:27 +0000 (+0000)
Subject: Use endtime to include the job that was clicked on.
X-Git-Tag: Release-7.0.0~6355
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=146c40c88ae6de707bda158aed0bd54a5bfb8902;p=bacula%2Fbacula

Use endtime to include the job that was clicked on.


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

diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index a97eeba592..8823d5ceeb 100644
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -132,14 +132,14 @@ void prerestorePage::okButtonPushed()
 
    this->hide();
 
-   cmd = QString("restore ");
-   cmd += "fileset=\"" + filesetCombo->currentText() + "\" ";
-   cmd += "client=\"" + clientCombo->currentText() + "\" ";
+   cmd = QString("restore");
+   cmd += " fileset=\"" + filesetCombo->currentText() + "\"";
+   cmd += " client=\"" + clientCombo->currentText() + "\"";
    if (selectJobsRadio->isChecked()) {
       if (poolCombo->currentText() != "Any" ){
-         cmd += "pool=\"" + poolCombo->currentText() + "\" ";
+         cmd += " pool=\"" + poolCombo->currentText() + "\"";
       }
-      cmd += "storage=\"" + storageCombo->currentText() + "\" ";
+      cmd += " storage=\"" + storageCombo->currentText() + "\"";
       if (recentCheckBox->checkState() == Qt::Checked) {
          cmd += " current";
       } else {
@@ -252,7 +252,7 @@ void prerestorePage::jobdefsFromJob(QStringList &fieldlist, QString jobId)
    QString job, client, fileset;
    QString query("");
    query = "SELECT DISTINCT Job.Name AS JobName, Client.Name AS Client,"
-   " FileSet.FileSet AS FileSet, Job.Starttime AS JobStart"
+   " FileSet.FileSet AS FileSet, Job.EndTime AS JobEnd"
    " From Job, Client, FileSet"
    " WHERE Job.FileSetId=FileSet.FileSetId AND Job.ClientId=Client.ClientId"
    " AND JobId=\'" + jobId + "\'";