mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-11 23:49:38 -05:00
fixed shifting bug in forums when setting a post as read, caused by wrong calculation of parent index
This commit is contained in:
parent
77d56916a0
commit
af0161054f
@ -281,12 +281,22 @@ void *RsGxsForumModel::getParentRef(void *ref,int& row) const
|
||||
{
|
||||
ForumModelIndex ref_entry;
|
||||
|
||||
if(mTreeMode == TREE_MODE_FLAT)
|
||||
return NULL;
|
||||
|
||||
if(!convertRefPointerToTabEntry(ref,ref_entry) || ref_entry >= mPosts.size())
|
||||
return NULL ;
|
||||
|
||||
if(mTreeMode == TREE_MODE_FLAT)
|
||||
{
|
||||
if(ref_entry == 0)
|
||||
{
|
||||
RsErr() << "getParentRef() shouldn't be asked for the parent of NULL" << std::endl;
|
||||
row = 0;
|
||||
}
|
||||
else
|
||||
row = ref_entry-1;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ForumModelIndex parent_entry = mPosts[ref_entry].mParent;
|
||||
|
||||
if(parent_entry == 0) // top level index
|
||||
@ -726,7 +736,11 @@ void RsGxsForumModel::setPosts(const RsGxsForumGroup& group, const std::vector<F
|
||||
{
|
||||
preMods();
|
||||
|
||||
beginRemoveRows(QModelIndex(),0,mPosts[0].mChildren.size()-1);
|
||||
if(mTreeMode == TREE_MODE_FLAT)
|
||||
beginRemoveRows(QModelIndex(),0,mPosts.size()-1);
|
||||
else
|
||||
beginRemoveRows(QModelIndex(),0,mPosts[0].mChildren.size()-1);
|
||||
|
||||
endRemoveRows();
|
||||
|
||||
mForumGroup = group;
|
||||
@ -750,7 +764,10 @@ void RsGxsForumModel::setPosts(const RsGxsForumGroup& group, const std::vector<F
|
||||
debug_dump();
|
||||
#endif
|
||||
|
||||
beginInsertRows(QModelIndex(),0,mPosts[0].mChildren.size()-1);
|
||||
if(mTreeMode == TREE_MODE_FLAT)
|
||||
beginInsertRows(QModelIndex(),0,mPosts.size()-1);
|
||||
else
|
||||
beginInsertRows(QModelIndex(),0,mPosts[0].mChildren.size()-1);
|
||||
endInsertRows();
|
||||
postMods();
|
||||
emit forumLoaded();
|
||||
@ -1274,18 +1291,24 @@ QModelIndex RsGxsForumModel::getIndexOfMessage(const RsGxsMessageId& mid) const
|
||||
|
||||
// First look into msg versions, in case the msg is a version of an existing message
|
||||
|
||||
for(auto it(mPostVersions.begin());it!=mPostVersions.end();++it)
|
||||
for(auto it(mPostVersions.begin());it!=mPostVersions.end() && postId==mid;++it)
|
||||
for(uint32_t i=0;i<it->second.size();++i)
|
||||
if(it->second[i].second == mid)
|
||||
{
|
||||
postId = it->first;
|
||||
break;
|
||||
}
|
||||
|
||||
for(uint32_t i=0;i<mPosts.size();++i)
|
||||
for(uint32_t i=1;i<mPosts.size();++i)
|
||||
if(mPosts[i].mMsgId == postId)
|
||||
{
|
||||
void *ref ;
|
||||
convertTabEntryToRefPointer(i,ref);
|
||||
convertTabEntryToRefPointer(i,ref); // we dont use i+1 here because i is not a row, but an index in the mPosts tab
|
||||
|
||||
return createIndex(mPosts[i].prow,0,ref);
|
||||
if(mTreeMode == TREE_MODE_FLAT)
|
||||
return createIndex(i-1,0,ref);
|
||||
else
|
||||
return createIndex(mPosts[i].prow,0,ref);
|
||||
}
|
||||
|
||||
return QModelIndex();
|
||||
|
@ -84,20 +84,6 @@
|
||||
|
||||
// We need consts for that!! Defined in multiple places.
|
||||
|
||||
#ifdef TO_REMOVE
|
||||
#define ROLE_THREAD_MSGID Qt::UserRole
|
||||
#define ROLE_THREAD_STATUS Qt::UserRole + 1
|
||||
#define ROLE_THREAD_MISSING Qt::UserRole + 2
|
||||
#define ROLE_THREAD_AUTHOR Qt::UserRole + 3
|
||||
// no need to copy, don't count in ROLE_THREAD_COUNT
|
||||
#define ROLE_THREAD_READCHILDREN Qt::UserRole + 4
|
||||
#define ROLE_THREAD_UNREADCHILDREN Qt::UserRole + 5
|
||||
#define ROLE_THREAD_SORT Qt::UserRole + 6
|
||||
#define ROLE_THREAD_PINNED Qt::UserRole + 7
|
||||
|
||||
#define ROLE_THREAD_COUNT 4
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_FORUMS
|
||||
static std::ostream& operator<<(std::ostream& o,const QModelIndex& q)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user