IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Show flagged posts consistently throughout the UI (#7063)

Browse Source
This commit is contained in:
Joram Wilander
2017-08-01 09:04:28 -04:00
committed by Harrison Healey
parent 0331409488
commit 4ef844298f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/post_view/post_info/index.js
View File

@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {removePost, addReaction} from 'mattermost-redux/actions/posts';
import {getBool} from 'mattermost-redux/selectors/entities/preferences';
import {get, getBool} from 'mattermost-redux/selectors/entities/preferences';
import {Preferences} from 'utils/constants.jsx';
@@ -15,7 +15,7 @@ function mapStateToProps(state, ownProps) {
return {
...ownProps,
useMilitaryTime: getBool(state, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.USE_MILITARY_TIME, false),
isFlagged: getBool(state, Preferences.CATEGORY_FLAGGED_POST, ownProps.post.id)
isFlagged: get(state, Preferences.CATEGORY_FLAGGED_POST, ownProps.post.id, null) != null
};
}

4
webapp/components/rhs_thread/rhs_thread.jsx
View File

@@ -343,7 +343,7 @@ export default class RhsThread extends React.Component {
let isRootFlagged = false;
if (this.state.flaggedPosts) {
isRootFlagged = this.state.flaggedPosts.get(selected.id) === 'true';
isRootFlagged = this.state.flaggedPosts.get(selected.id) != null;
}
let rootStatus = 'offline';
@@ -367,7 +367,7 @@ export default class RhsThread extends React.Component {
let isFlagged = false;
if (this.state.flaggedPosts) {
isFlagged = this.state.flaggedPosts.get(comPost.id) === 'true';
isFlagged = this.state.flaggedPosts.get(comPost.id) != null;
}
let status = 'offline';

2
webapp/components/search_results.jsx
View File

@@ -284,7 +284,7 @@ export default class SearchResults extends React.Component {
let isFlagged = false;
if (this.state.flaggedPosts) {
isFlagged = this.state.flaggedPosts.get(post.id) === 'true';
isFlagged = this.state.flaggedPosts.get(post.id) != null;
}
const reverseCount = arr.length - idx - 1;