summaryrefslogtreecommitdiffstats
path: root/app/slackimport.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-01-31 13:04:17 +0000
committerenahum <nahumhbl@gmail.com>2017-01-31 10:04:17 -0300
commit67739cb516309e06a7cb08cc5807140ac9af9b13 (patch)
tree7ebdcc933cbb338fc02e39ab6600e7e8bb3651dd /app/slackimport.go
parentc0c6ef47d99994ae5fb20c7fb429411b6f8eb328 (diff)
downloadchat-67739cb516309e06a7cb08cc5807140ac9af9b13.tar.gz
chat-67739cb516309e06a7cb08cc5807140ac9af9b13.tar.bz2
chat-67739cb516309e06a7cb08cc5807140ac9af9b13.zip
PLT-5365 Import of basic user properties. (#5231)
Diffstat (limited to 'app/slackimport.go')
-rw-r--r--app/slackimport.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/slackimport.go b/app/slackimport.go
index e4beb3d3d..75a1606af 100644
--- a/app/slackimport.go
+++ b/app/slackimport.go
@@ -178,7 +178,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map
Password: password,
}
- if mUser := ImportUser(team, &newUser); mUser != nil {
+ if mUser := OldImportUser(team, &newUser); mUser != nil {
addedUsers[sUser.Id] = mUser
log.WriteString(utils.T("api.slackimport.slack_add_users.email_pwd", map[string]interface{}{"Email": newUser.Email, "Password": password}))
} else {
@@ -210,7 +210,7 @@ func SlackAddBotUser(teamId string, log *bytes.Buffer) *model.User {
Password: password,
}
- if mUser := ImportUser(team, &botUser); mUser != nil {
+ if mUser := OldImportUser(team, &botUser); mUser != nil {
log.WriteString(utils.T("api.slackimport.slack_add_bot_user.email_pwd", map[string]interface{}{"Email": botUser.Email, "Password": password}))
return mUser
} else {