IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some duplicate message IDs in Bulk Importer. (#6850)

Browse Source
This commit is contained in:
George Goldberg
2017-07-05 15:49:30 +01:00
committed by Corey Hulen
parent 4219d39e97
commit 65289f26e7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/import.go
View File

@@ -1081,14 +1081,14 @@ func ImportDirectPost(data *DirectPostImportData, dryRun bool) *model.AppError {
if len(userIds) == 2 {
ch, err := createDirectChannel(userIds[0], userIds[1])
if err != nil && err.Id != store.CHANNEL_EXISTS_ERROR {
return model.NewAppError("BulkImport", "app.import.import_direct_channel.create_direct_channel.error", nil, "", http.StatusBadRequest)
return model.NewAppError("BulkImport", "app.import.import_direct_post.create_direct_channel.error", nil, "", http.StatusBadRequest)
} else {
channel = ch
}
} else {
ch, err := createGroupChannel(userIds, userIds[0])
if err != nil && err.Id != store.CHANNEL_EXISTS_ERROR {
return model.NewAppError("BulkImport", "app.import.import_direct_channel.create_group_channel.error", nil, "", http.StatusBadRequest)
return model.NewAppError("BulkImport", "app.import.import_direct_post.create_group_channel.error", nil, "", http.StatusBadRequest)
} else {
channel = ch
}

4
i18n/en.json
View File

@@ -3060,11 +3060,11 @@
"translation": "Could not find channel member when importing direct channel post"
},
{
"id": "app.import.import_direct_channel.create_direct_channel.error",
"id": "app.import.import_direct_post.create_direct_channel.error",
"translation": "Failed to get direct channel"
},
{
"id": "app.import.import_direct_channel.create_group_channel.error",
"id": "app.import.import_direct_post.create_group_channel.error",
"translation": "Failed to get group channel"
},
{