FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finalize today work.

Browse Source
This commit is contained in:
Martin Rotter 2015-11-20 10:38:01 +01:00
parent 6354910882
commit 8c7079de26
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/messagesmodel.cpp
View File

@ -331,8 +331,7 @@ bool MessagesModel::switchMessageImportance(int row_index) {
} }
bool MessagesModel::switchBatchMessageImportance(const QModelIndexList &messages) { bool MessagesModel::switchBatchMessageImportance(const QModelIndexList &messages) {
QSqlDatabase db_handle = database(); QSqlQuery query_read_msg(database());
QSqlQuery query_read_msg(db_handle);
QStringList message_ids; QStringList message_ids;
QList<QPair<int,RootItem::Importance> > message_states; QList<QPair<int,RootItem::Importance> > message_states;
@ -362,8 +361,7 @@ bool MessagesModel::switchBatchMessageImportance(const QModelIndexList &messages
} }
bool MessagesModel::setBatchMessagesDeleted(const QModelIndexList &messages, int deleted) { bool MessagesModel::setBatchMessagesDeleted(const QModelIndexList &messages, int deleted) {
QSqlDatabase db_handle = database(); QSqlQuery query_read_msg(database());
QSqlQuery query_read_msg(db_handle);
QStringList message_ids; QStringList message_ids;
QList<int> message_ids_num; QList<int> message_ids_num;
@ -379,9 +377,7 @@ bool MessagesModel::setBatchMessagesDeleted(const QModelIndexList &messages, int
QString sql_delete_query; QString sql_delete_query;
// TODO: todo if (m_selectedItem->kind() != RootItemKind::Bin) {
/*
if (m_selectedItem.mode() == FeedsSelection::MessagesFromFeeds) {
sql_delete_query = QString(QSL("UPDATE Messages SET is_deleted = %2 WHERE id IN (%1);")).arg(message_ids.join(QSL(", ")), sql_delete_query = QString(QSL("UPDATE Messages SET is_deleted = %2 WHERE id IN (%1);")).arg(message_ids.join(QSL(", ")),
QString::number(deleted)); QString::number(deleted));
} }
@ -389,7 +385,6 @@ bool MessagesModel::setBatchMessagesDeleted(const QModelIndexList &messages, int
sql_delete_query = QString(QSL("UPDATE Messages SET is_pdeleted = %2 WHERE id IN (%1);")).arg(message_ids.join(QSL(", ")), sql_delete_query = QString(QSL("UPDATE Messages SET is_pdeleted = %2 WHERE id IN (%1);")).arg(message_ids.join(QSL(", ")),
QString::number(deleted)); QString::number(deleted));
} }
*/
if (query_read_msg.exec(sql_delete_query)) { if (query_read_msg.exec(sql_delete_query)) {
fetchAllData(); fetchAllData();
@ -397,7 +392,7 @@ bool MessagesModel::setBatchMessagesDeleted(const QModelIndexList &messages, int
//emit messageCountsChanged(); //emit messageCountsChanged();
// TODO: counts changed // TODO: counts changed - zde pokracovat podle metod setbarchmessageread
//emit messageCountsChanged(m_selectedItem.mode(), true, false); //emit messageCountsChanged(m_selectedItem.mode(), true, false);
return true; return true;
} }
@ -422,9 +417,7 @@ bool MessagesModel::setBatchMessagesRead(const QModelIndexList &messages, RootIt
return false; return false;
} }
QSqlDatabase db_handle = database(); QSqlQuery query_read_msg(database());
QSqlQuery query_read_msg(db_handle);
query_read_msg.setForwardOnly(true); query_read_msg.setForwardOnly(true);
if (query_read_msg.exec(QString(QSL("UPDATE Messages SET is_read = %2 WHERE id IN (%1);")) if (query_read_msg.exec(QString(QSL("UPDATE Messages SET is_read = %2 WHERE id IN (%1);"))