This commit is contained in:
Diego Mello 2017-11-24 11:31:59 -02:00
parent 65a6024278
commit 92a773693a
1 changed files with 6 additions and 6 deletions

View File

@ -78,7 +78,7 @@ export default class MessageActions extends React.Component {
const roomRoles = Array.from(Object.keys(roles), i => roles[i].value); const roomRoles = Array.from(Object.keys(roles), i => roles[i].value);
const userRoles = this.props.user.roles || []; const userRoles = this.props.user.roles || [];
this.mergedRoles = [...new Set([...roomRoles, ...userRoles])]; this.mergedRoles = [...new Set([...roomRoles, ...userRoles])];
this.setPermissions(this.props); this.setPermissions(this.props.permissions);
} }
async componentWillReceiveProps(nextProps) { async componentWillReceiveProps(nextProps) {
@ -150,15 +150,15 @@ export default class MessageActions extends React.Component {
} }
componentDidUpdate() { componentDidUpdate() {
this.setPermissions(this.props); this.setPermissions(this.props.permissions);
} }
setPermissions(props) { setPermissions(permissions) {
this.hasEditPermission = props.permissions['edit-message'] this.hasEditPermission = permissions['edit-message']
.some(item => this.mergedRoles.indexOf(item) !== -1); .some(item => this.mergedRoles.indexOf(item) !== -1);
this.hasDeletePermission = props.permissions['delete-message'] this.hasDeletePermission = permissions['delete-message']
.some(item => this.mergedRoles.indexOf(item) !== -1); .some(item => this.mergedRoles.indexOf(item) !== -1);
this.hasForceDeletePermission = props.permissions['force-delete-message'] this.hasForceDeletePermission = permissions['force-delete-message']
.some(item => this.mergedRoles.indexOf(item) !== -1); .some(item => this.mergedRoles.indexOf(item) !== -1);
} }