diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-04-28 16:29:13 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-04-28 16:29:13 -0400 |
commit | f3fa435a1b35c2ada4cd9a81744a41904fe97909 (patch) | |
tree | 4044a07b7c7345084e4543282f165d4c5e716f80 /webapp | |
parent | 938caa061d4f5aad00133926c86d3d6f4485b3a2 (diff) | |
download | chat-f3fa435a1b35c2ada4cd9a81744a41904fe97909.tar.gz chat-f3fa435a1b35c2ada4cd9a81744a41904fe97909.tar.bz2 chat-f3fa435a1b35c2ada4cd9a81744a41904fe97909.zip |
Fixing slack import. (#2819)
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/client/client.jsx | 5 | ||||
-rw-r--r-- | webapp/components/team_import_tab.jsx | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 53a514082..6a7c5de40 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -348,10 +348,9 @@ export default class Client { importSlack = (fileData, success, error) => { request. - post(`${this.getTeamsRoute()}/import_team`). + post(`${this.getTeamNeededRoute()}/import_team`). set(this.defaultHeaders). - type('application/json'). - accept('application/json'). + accept('application/octet-stream'). send(fileData). end(this.handleResponse.bind(this, 'importSlack', success, error)); } diff --git a/webapp/components/team_import_tab.jsx b/webapp/components/team_import_tab.jsx index 03d35bb3f..782273c5a 100644 --- a/webapp/components/team_import_tab.jsx +++ b/webapp/components/team_import_tab.jsx @@ -33,8 +33,8 @@ class TeamImportTab extends React.Component { this.setState({status: 'fail', link: ''}); } - onImportSuccess(data) { - this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(data)}); + onImportSuccess(data, res) { + this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(res.text)}); } doImportSlack(file) { @@ -167,4 +167,4 @@ TeamImportTab.propTypes = { intl: intlShape.isRequired }; -export default injectIntl(TeamImportTab);
\ No newline at end of file +export default injectIntl(TeamImportTab); |