opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow switching to private channels with /join command (#6579)

Browse Source
This commit is contained in:
Joram Wilander
2017-06-05 11:57:50 -04:00
committed by GitHub
parent b0f32e3c19
commit 0f3bd85b8d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/command_join.go
+5 -1
View File
@@ -40,8 +40,12 @@ func (me *JoinProvider) DoCommand(args *model.CommandArgs, message string) *mode
channel := result.Data.(*model.Channel)
if channel.Name == message {
allowed := false
if (channel.Type == model.CHANNEL_PRIVATE && SessionHasPermissionToChannel(args.Session, channel.Id, model.PERMISSION_READ_CHANNEL)) || channel.Type == model.CHANNEL_OPEN {
allowed = true
}
if channel.Type != model.CHANNEL_OPEN {
if !allowed {
return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
}
webapp/components/confirm_modal.jsx
+1 -3
View File
@@ -22,9 +22,7 @@ export default class ConfirmModal extends React.Component {
}
componentWillUnmount() {
if (!this.props.show) {
document.removeEventListener('keypress', this.handleKeypress);
}
document.removeEventListener('keypress', this.handleKeypress);
}
componentWillReceiveProps(nextProps) {