mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-14 08:59:50 -05:00
Forums:
- Load all messages (not only latest) - Fixed flat view git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e6eb0e22ff
commit
3d38367d75
@ -99,7 +99,6 @@ void GxsForumsFillThread::run()
|
|||||||
/* get all messages of the forum */
|
/* get all messages of the forum */
|
||||||
RsTokReqOptions opts;
|
RsTokReqOptions opts;
|
||||||
opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
|
opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
|
||||||
opts.mOptions = RS_TOKREQOPT_MSG_LATEST;
|
|
||||||
|
|
||||||
std::list<RsGxsGroupId> grpIds;
|
std::list<RsGxsGroupId> grpIds;
|
||||||
grpIds.push_back(mForumId);
|
grpIds.push_back(mForumId);
|
||||||
@ -169,7 +168,7 @@ void GxsForumsFillThread::run()
|
|||||||
|
|
||||||
const RsGxsForumMsg &msg = *msgIt;
|
const RsGxsForumMsg &msg = *msgIt;
|
||||||
|
|
||||||
if (!msg.mMeta.mParentId.isNull()) {
|
if (!mFlatView && !msg.mMeta.mParentId.isNull()) {
|
||||||
++msgIt;
|
++msgIt;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -179,7 +178,9 @@ void GxsForumsFillThread::run()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
QTreeWidgetItem *item = mParent->convertMsgToThreadWidget(msg, mUseChildTS, mFilterColumn);
|
QTreeWidgetItem *item = mParent->convertMsgToThreadWidget(msg, mUseChildTS, mFilterColumn);
|
||||||
|
if (!mFlatView) {
|
||||||
threadList.push_back(QPair<std::string, QTreeWidgetItem*>(msg.mMeta.mMsgId.toStdString(), item));
|
threadList.push_back(QPair<std::string, QTreeWidgetItem*>(msg.mMeta.mMsgId.toStdString(), item));
|
||||||
|
}
|
||||||
calculateExpand(msg, item);
|
calculateExpand(msg, item);
|
||||||
|
|
||||||
mItems.append(item);
|
mItems.append(item);
|
||||||
@ -219,11 +220,7 @@ void GxsForumsFillThread::run()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
QTreeWidgetItem *item = mParent->convertMsgToThreadWidget(msg, mUseChildTS, mFilterColumn);
|
QTreeWidgetItem *item = mParent->convertMsgToThreadWidget(msg, mUseChildTS, mFilterColumn);
|
||||||
if (mFlatView) {
|
|
||||||
mItems.append(item);
|
|
||||||
} else {
|
|
||||||
threadPair.second->addChild(item);
|
threadPair.second->addChild(item);
|
||||||
}
|
|
||||||
|
|
||||||
calculateExpand(msg, item);
|
calculateExpand(msg, item);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user