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

fix dm custom slash command regression (#7008)

Browse Source
This commit is contained in:
Chris
2017-07-25 11:36:14 -07:00
committed by Christopher Speller
parent 6418e912df
commit e5e450fc09
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api4/command.go
View File

@@ -212,7 +212,13 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
commandArgs.TeamId = channel.TeamId
if commandArgs.TeamId == "" {
commandArgs.TeamId = channel.TeamId
} else if c.Session.GetTeamByTeamId(commandArgs.TeamId) == nil {
c.SetPermissionError(model.PERMISSION_USE_SLASH_COMMANDS)
return
}
commandArgs.UserId = c.Session.UserId
commandArgs.T = c.T
commandArgs.Session = c.Session

2
webapp/components/create_comment.jsx
View File

@@ -10,6 +10,7 @@ import UserStore from 'stores/user_store.jsx';
import PostDeletedModal from './post_deleted_modal.jsx';
import PostStore from 'stores/post_store.jsx';
import PreferenceStore from 'stores/preference_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import MessageHistoryStore from 'stores/message_history_store.jsx';
import Textbox from './textbox.jsx';
import MsgTyping from './msg_typing.jsx';
@@ -199,6 +200,7 @@ export default class CreateComment extends React.Component {
const args = {};
args.channel_id = this.props.channelId;
args.team_id = TeamStore.getCurrentId();
args.root_id = this.props.rootId;
args.parent_id = this.props.rootId;
ChannelActions.executeCommand(

3
webapp/components/create_post.jsx
View File

@@ -23,6 +23,7 @@ import PostStore from 'stores/post_store.jsx';
import MessageHistoryStore from 'stores/message_history_store.jsx';
import UserStore from 'stores/user_store.jsx';
import PreferenceStore from 'stores/preference_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import ConfirmModal from './confirm_modal.jsx';
import Constants from 'utils/constants.jsx';
@@ -151,6 +152,7 @@ export default class CreatePost extends React.Component {
const args = {};
args.channel_id = this.state.channelId;
args.team_id = TeamStore.getCurrentId();
ChannelActions.executeCommand(
post.message,
args,
@@ -466,6 +468,7 @@ export default class CreatePost extends React.Component {
e.preventDefault();
const args = {};
args.channel_id = this.state.channelId;
args.team_id = TeamStore.getCurrentId();
ChannelActions.executeCommand(
'/shortcuts',
args,