diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
| commit | 62901defaebb8f3524bdfcad86b2576cfd9fe587 (patch) | |
| tree | b0740451c56c68c5284834fd02bbce4d831acc17 /webapp/components/team_import_tab.jsx | |
| parent | ad9dfc9c42b6597515d9eb0a96e9f069372dffdd (diff) | |
| parent | f3fa435a1b35c2ada4cd9a81744a41904fe97909 (diff) | |
| download | chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.gz chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.bz2 chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'webapp/components/team_import_tab.jsx')
| -rw-r--r-- | webapp/components/team_import_tab.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
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); |