No reason to show purge files option in context sensitive menu of a job that

has already been purged.

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

diff --git a/bacula/src/qt-console/TODO b/bacula/src/qt-console/TODO
index 21b36caba150ed46742208b5c7744a4042eb05b1..384f1dc0f99ff940e7e3a39176c7a570ab476002 100644 (file)
--- a/bacula/src/qt-console/TODO
+++ b/bacula/src/qt-console/TODO
@@ -10,8 +10,6 @@ Test left pane of restore with 2 windows drives in one backup job.
 User preferences.  With log to stdout options.
 Have settings for defaults of limits on joblist
 
-show purged flag in joblist.  Don't have purge option show if already purged.
-
 Add context sensitive options for most commands
 status dir on page select director item
 All items with jobid= that I thought could work from joblist are done.
@@ -83,6 +81,8 @@ global one defined in the mainWin class (if I remember right).
 ============================================================
 DONE:
 ============================================================
+show purged flag in joblist.  Don't have purge option show if already purged.
+
 move behavior of:
   MainWin::setContextMenuDockText
   MainWin::setTreeWidgetItemDockColor

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index 48b864d96eb85ae15eb7451fdff671b316043609..c69704c09ce3c9cd8a3be4e315f21e2054d80f55 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -166,6 +166,7 @@ void JobList::populateTable()
    QStringList headerlist = (QStringList()
       << "Job Id" << "Job Name" << "Client" << "Job Starttime" << "Job Type" 
       << "Job Level" << "Job Files" << "Job Bytes" << "Job Status"  << "Purged" );
+   m_purgedIndex = headerlist.indexOf("Purged");
 
    /* Initialize the QTableWidget */
    m_checkCurrentWidget = false;
@@ -267,6 +268,12 @@ void JobList::tableItemChanged(QTableWidgetItem *currentItem, QTableWidgetItem *
       int row = currentItem->row();
       QTableWidgetItem* jobitem = mp_tableWidget->item(row, 0);
       m_currentJob = jobitem->text();
+      jobitem = mp_tableWidget->item(row, m_purgedIndex);
+      QString purged = jobitem->text();
+      mp_tableWidget->removeAction(actionPurgeFiles);
+      if (purged == "0") {
+         mp_tableWidget->addAction(actionPurgeFiles);
+      }
    }
 }
 

diff --git a/bacula/src/qt-console/joblist/joblist.h b/bacula/src/qt-console/joblist/joblist.h
index cacc930d4f51cf6f2eca022cdaea6777a7114691..0b6bfb9aae6c0147c7a1234f67cdd1d4d49ea874 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.h
+++ b/bacula/src/qt-console/joblist/joblist.h
@@ -71,6 +71,7 @@ private:
    QString m_currentJob;
    bool m_populated;
    bool m_checkCurrentWidget;
+   int m_purgedIndex;
 };
 
 #endif /* _JOBLIST_H_ */