summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-07-25 11:36:14 -0700
committerChristopher Speller <crspeller@gmail.com>2017-07-25 11:36:14 -0700
commite5e450fc097c14110e942731018041cd1931aa25 (patch)
tree82c43790c6e5bf9ce6f38d773811b939cf3c9928 /webapp
parent6418e912df647d38e22b75adc668824c7375073a (diff)
downloadchat-e5e450fc097c14110e942731018041cd1931aa25.tar.gz
chat-e5e450fc097c14110e942731018041cd1931aa25.tar.bz2
chat-e5e450fc097c14110e942731018041cd1931aa25.zip
fix dm custom slash command regression (#7008)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/create_comment.jsx2
-rw-r--r--webapp/components/create_post.jsx3
2 files changed, 5 insertions, 0 deletions
diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx
index d9274c34a..94852c465 100644
--- a/webapp/components/create_comment.jsx
+++ b/webapp/components/create_comment.jsx
@@ -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(
diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx
index 32f812aa3..4b092ff08 100644
--- a/webapp/components/create_post.jsx
+++ b/webapp/components/create_post.jsx
@@ -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,