diff options
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); |