Fix some duplicate message IDs in Bulk Importer. (#6850)
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
4219d39e97
Коммит
65289f26e7
@@ -1081,14 +1081,14 @@ func ImportDirectPost(data *DirectPostImportData, dryRun bool) *model.AppError {
|
|||||||
if len(userIds) == 2 {
|
if len(userIds) == 2 {
|
||||||
ch, err := createDirectChannel(userIds[0], userIds[1])
|
ch, err := createDirectChannel(userIds[0], userIds[1])
|
||||||
if err != nil && err.Id != store.CHANNEL_EXISTS_ERROR {
|
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 {
|
} else {
|
||||||
channel = ch
|
channel = ch
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ch, err := createGroupChannel(userIds, userIds[0])
|
ch, err := createGroupChannel(userIds, userIds[0])
|
||||||
if err != nil && err.Id != store.CHANNEL_EXISTS_ERROR {
|
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 {
|
} else {
|
||||||
channel = ch
|
channel = ch
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3060,11 +3060,11 @@
|
|||||||
"translation": "Could not find channel member when importing direct channel post"
|
"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"
|
"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"
|
"translation": "Failed to get group channel"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user