Browse Source

add error msg

fix-1934
lewis 3 years ago
parent
commit
e6e67ab18a
4 changed files with 24 additions and 9 deletions
  1. +2
    -0
      options/locale/locale_en-US.ini
  2. +2
    -0
      options/locale/locale_zh-CN.ini
  3. +9
    -8
      routers/repo/attachment.go
  4. +11
    -1
      web_src/js/components/MinioUploader.vue

+ 2
- 0
options/locale/locale_en-US.ini View File

@@ -2196,6 +2196,8 @@ topic.count_prompt = You can not select more than 25 topics
topic.format_prompt = Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.
imagetopic.format_prompt = Topics can be up to 35 characters long.

dataset.error.complete = The file was uploaded incompletely, please upload the file again.

[org]
org_name_holder = Organization Name
org_full_name_holder = Organization Full Name


+ 2
- 0
options/locale/locale_zh-CN.ini View File

@@ -2206,6 +2206,8 @@ topic.count_prompt=您最多选择25个标签
topic.format_prompt=标签必须以中文、字母或数字开头,可以包含连字符 (-),并且长度不得超过35个字符
imagetopic.format_prompt=标签长度不得超过35个字符

dataset.error.complete = 文件上传不完整,请重新上传。

[org]
org_name_holder=组织名称
org_full_name_holder=组织全名


+ 9
- 8
routers/repo/attachment.go View File

@@ -856,16 +856,17 @@ func CompleteMultipart(ctx *context.Context) {

if typeCloudBrain == models.TypeCloudBrainOne {
_, err = storage.CompleteMultiPartUpload(uuid, uploadID, fileChunk.TotalChunks)
if err != nil {
ctx.Error(500, fmt.Sprintf("CompleteMultiPartUpload failed: %v", err))
return
}
} else {
err = storage.CompleteObsMultiPartUpload(uuid, uploadID, fileName, fileChunk.TotalChunks)
if err != nil {
ctx.Error(500, fmt.Sprintf("CompleteObsMultiPartUpload failed: %v", err))
return
}
}

if err != nil {
log.Error("CompleteMultiPartUpload(uuid:%s) failed: %v", uuid, err, ctx.Data["MsgID"])
ctx.JSON(200, map[string]string{
"result_code": "-1",
"err_msg": ctx.Tr("repo.dataset.error.complete"),
})
return
}

fileChunk.IsUploaded = models.FileUploaded


+ 11
- 1
web_src/js/components/MinioUploader.vue View File

@@ -473,7 +473,17 @@ export default {
_csrf: csrf,
description:_this.desc
})
);
)
.then(function (response) {
console.log(response.data);
var errCode = response.data.result_code;
if (errCode != "0") {
console.log(response.data.err_msg);
}
})
.catch(function (error) {
console.log(error);
});
}

const successChunks = [];


Loading…
Cancel
Save