From: Andreas Piesk Date: Mon, 5 Oct 2009 08:05:56 +0000 (+0200) Subject: Remove useless ScratchPool refs from Bat media list X-Git-Tag: Release-5.0.0~293^2~4 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=774fae86caf8195cd36629e64a71acad08af9cd9;p=bacula%2Fbacula Remove useless ScratchPool refs from Bat media list Signed-off-by: Eric Bollengier --- diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp index d956a4d7c0..8466f30e47 100644 --- a/bacula/src/qt-console/medialist/medialist.cpp +++ b/bacula/src/qt-console/medialist/medialist.cpp @@ -87,7 +87,7 @@ void MediaList::populateTree() << tr("Jobs") << tr("Retention") << tr("Media Type") << tr("Slot") << tr("Use Duration") << tr("Max Jobs") << tr("Max Files") << tr("Max Bytes") << tr("Recycle") << tr("Last Written") << tr("First Written") << tr("Read Time") - << tr("Write Time") << tr("Recycle Count") << tr("Recycle Pool") << tr("Scratch Pool")); + << tr("Write Time") << tr("Recycle Count") << tr("Recycle Pool")); m_checkcurwidget = false; mp_treeWidget->clear(); @@ -133,11 +133,10 @@ void MediaList::populateTree() " Media.FirstWritten AS FirstWritten," " (VolReadTime/1000000) AS ReadTime, (VolWriteTime/1000000) AS WriteTime," " RecycleCount AS ReCyCount," - " RecPool.Name AS RecyclePool, ScrPool.Name AS ScratchPool" + " RecPool.Name AS RecyclePool" " FROM Media" " JOIN Pool ON (Media.PoolId=Pool.PoolId)" " LEFT OUTER JOIN Pool AS RecPool ON (Media.RecyclePoolId=RecPool.PoolId)" - " LEFT OUTER JOIN Pool AS ScrPool ON (Media.ScratchPoolId=ScrPool.PoolId)" " WHERE "; query += " Pool.Name IN (" + pool_comsep + ")"; query += " ORDER BY Pool.Name, Media"; @@ -248,9 +247,6 @@ void MediaList::populateTree() /* recycle pool */ mediaitem.setTextFld(index++, fld.next()); - /* Scratch pool */ - mediaitem.setTextFld(index++, fld.next()); - } /* foreach resultline */ counter += 1; } /* if results from query */