From 09266bca3fd3b8c553a4ea2ee48abde5a791588a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 21 Sep 2010 15:59:40 +0200 Subject: [PATCH] Fix bat browser to ignore copy jobs. Fix bug #1604 --- bacula/src/qt-console/mainwin.cpp | 2 +- bacula/src/qt-console/restore/restoretree.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index 7740ae9640..c3d803c046 100644 --- a/bacula/src/qt-console/mainwin.cpp +++ b/bacula/src/qt-console/mainwin.cpp @@ -941,7 +941,7 @@ void MainWin::readPreferences() settings.endGroup(); settings.beginGroup("JobList"); m_recordLimitCheck = settings.value("recordLimitCheck", true).toBool(); - m_recordLimitVal = settings.value("recordLimitVal", 150).toInt(); + m_recordLimitVal = settings.value("recordLimitVal", 50).toInt(); m_daysLimitCheck = settings.value("daysLimitCheck", false).toBool(); m_daysLimitVal = settings.value("daysLimitVal", 28).toInt(); settings.endGroup(); diff --git a/bacula/src/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp index bc89a411a4..f39df9bcfe 100644 --- a/bacula/src/qt-console/restore/restoretree.cpp +++ b/bacula/src/qt-console/restore/restoretree.cpp @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2009 Free Software Foundation Europe e.V. + Copyright (C) 2007-2010 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -27,7 +27,6 @@ */ /* - * Version $Id$ * * Restore Class * @@ -766,6 +765,7 @@ void restoreTree::populateJobTable() " INNER JOIN Client ON (Job.ClientId=Client.ClientId)" " INNER JOIN FileSet ON (Job.FileSetId=FileSet.FileSetId)" " WHERE" + " Job.JobStatus IN ('T','W') AND Job.Type='B' AND" " Client.Name='" + clientCombo->currentText() + "'"; if ((jobCombo->currentIndex() >= 0) && (jobCombo->currentText() != tr("Any"))) { jobQuery += " AND Job.name = '" + jobCombo->currentText() + "'"; @@ -787,8 +787,8 @@ void restoreTree::populateJobTable() limit.setNum(limitSpinBox->value()); jobQuery += " LIMIT " + limit; } - if (mainWin->m_sqlDebug) - Pmsg1(000, "Query cmd : %s\n", jobQuery.toUtf8().data()); + if (mainWin->m_sqlDebug) Pmsg1(000, "Query cmd : %s\n", jobQuery.toUtf8().data()); + QStringList results; if (m_console->sql_cmd(jobQuery, results)) { -- 2.39.5