diff options
| author | George Goldberg <george@gberg.me> | 2017-07-12 14:13:25 +0100 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-12 22:13:25 +0900 |
| commit | 2bf64b54c236945727a2d93afb57b1665d1daa7a (patch) | |
| tree | a7b0b3c1114faf5e398b6cb06fd9e61fb818f7b9 /webapp | |
| parent | e975b84a12b8e3f547f4d811155d076a5a4fdcf9 (diff) | |
| download | chat-2bf64b54c236945727a2d93afb57b1665d1daa7a.tar.gz chat-2bf64b54c236945727a2d93afb57b1665d1daa7a.tar.bz2 chat-2bf64b54c236945727a2d93afb57b1665d1daa7a.zip | |
PLT-7025: Fix Slack Import API. (#6905)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/team_import_tab.jsx | 8 | ||||
| -rw-r--r-- | webapp/utils/utils.jsx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webapp/components/team_import_tab.jsx b/webapp/components/team_import_tab.jsx index a17442dc9..b310cdc12 100644 --- a/webapp/components/team_import_tab.jsx +++ b/webapp/components/team_import_tab.jsx @@ -29,12 +29,12 @@ class TeamImportTab extends React.Component { }; } - onImportFailure(e, err, res) { - this.setState({status: 'fail', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(res.text)}); + onImportFailure() { + this.setState({status: 'fail'}); } - onImportSuccess(data, res) { - this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(res.text)}); + onImportSuccess(data) { + this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(atob(data.results))}); } doImportSlack(file) { diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 529ea5666..83e538605 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -1107,7 +1107,7 @@ export function isDirectChannelForUser(otherUserId, channel) { } export function importSlack(file, success, error) { - Client4.importTeam(file, 'slack').then(success).catch(error); + Client4.importTeam(TeamStore.getCurrent().id, file, 'slack').then(success).catch(error); } export function windowWidth() { |