summaryrefslogtreecommitdiffstats
path: root/app/slackimport.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-01-27 15:14:54 +0000
committerCorey Hulen <corey@hulen.com>2017-01-27 10:14:54 -0500
commite07e9937e0e0ae4fcb2a51553238a7566d1e4c67 (patch)
tree9ca0511deff58df13d2b00a6d19c7bf77359e889 /app/slackimport.go
parent7b9586a740194a5add773483bd309cff84256b57 (diff)
downloadchat-e07e9937e0e0ae4fcb2a51553238a7566d1e4c67.tar.gz
chat-e07e9937e0e0ae4fcb2a51553238a7566d1e4c67.tar.bz2
chat-e07e9937e0e0ae4fcb2a51553238a7566d1e4c67.zip
PLT-5366, PLT-5364, PLT-5363: Bulk Import Part 1. (#5204)
This commit provides the first part of the bulk import system. The CLI command is provided, complete with validation & apply modes. All the basic properties of Teams and Channels can be imported. Users & Posts will follow separately in a future commit.
Diffstat (limited to 'app/slackimport.go')
-rw-r--r--app/slackimport.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/slackimport.go b/app/slackimport.go
index 508803126..edeb601e2 100644
--- a/app/slackimport.go
+++ b/app/slackimport.go
@@ -484,7 +484,7 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str
if mChannel == nil {
// Haven't found an existing channel to merge with. Try importing it as a new one.
- mChannel = ImportChannel(&newChannel)
+ mChannel = OldImportChannel(&newChannel)
if mChannel == nil {
l4g.Warn(utils.T("api.slackimport.slack_add_channels.import_failed.warn"), newChannel.DisplayName)
log.WriteString(utils.T("api.slackimport.slack_add_channels.import_failed", map[string]interface{}{"DisplayName": newChannel.DisplayName}))