Merge pull request #1996 from mattermost/plt-1768

PLT-1768 Clear deleted messages after channel leave and fix missig postlist error
Этот коммит содержится в:
Harrison Healey
2016-01-27 12:50:19 -05:00
родитель e467241a10 1575488650
Коммит ceebfe20ba
2 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@@ -19,7 +19,8 @@ export function emitChannelClickEvent(channel) {
AppDispatcher.handleViewAction({ AppDispatcher.handleViewAction({
type: ActionTypes.CLICK_CHANNEL, type: ActionTypes.CLICK_CHANNEL,
name: channel.name, name: channel.name,
id: channel.id id: channel.id,
prev: ChannelStore.getCurrentId()
}); });
} }

Просмотреть файл

@@ -451,6 +451,8 @@ class PostStoreClass extends EventEmitter {
post.filenames = []; post.filenames = [];
posts[post.id] = post; posts[post.id] = post;
this.makePostsInfo(post.channel_id);
this.postsInfo[post.channel_id].deletedPosts = posts; this.postsInfo[post.channel_id].deletedPosts = posts;
} }
@@ -610,7 +612,7 @@ PostStore.dispatchToken = AppDispatcher.register((payload) => {
case ActionTypes.CLICK_CHANNEL: case ActionTypes.CLICK_CHANNEL:
PostStore.clearFocusedPost(); PostStore.clearFocusedPost();
PostStore.clearChannelVisibility(action.id, true); PostStore.clearChannelVisibility(action.id, true);
PostStore.clearUnseenDeletedPosts(action.id); PostStore.clearUnseenDeletedPosts(action.prev);
break; break;
case ActionTypes.CREATE_POST: case ActionTypes.CREATE_POST:
PostStore.storePendingPost(action.post); PostStore.storePendingPost(action.post);