From 9e79a3031022cca01ecf83db331567d014d4c5d6 Mon Sep 17 00:00:00 2001 From: hit172587zpz Date: Tue, 17 Aug 2021 17:05:11 +0800 Subject: [PATCH 1/3] fix issue 228 --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/datasets/index.tmpl | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b81dc9694..50d580d20 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -767,6 +767,7 @@ cloudbrain2 = cloudbrain2 cloudbrain_selection = select cloudbrain cloudbrain_platform_selection = Select the cloudbrain platform you want to use: confirm_choice = confirm +cloudbran1_tips = Only data in zip format can create cloudbrain tasks template.items = Template Items template.git_content = Git Content (Default Branch) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 9dd2d254b..d20e11c85 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -769,6 +769,7 @@ cloudbrain2=云脑2 cloudbrain_selection=云脑选择 cloudbrain_platform_selection=选择您准备使用的云脑平台： confirm_choice=确定 +cloudbran1_tips=只有zip格式的数据才能发起云脑任务 template.items=模板选项 template.git_content=Git数据(默认分支) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 5ab2570c3..164ca1f43 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -66,10 +66,13 @@
-
+

{{if eq .Type 0}}{{.i18n.Tr "repo.cloudbrain1"}}{{else}}{{.i18n.Tr "repo.cloudbrain2"}}{{end}}-{{.i18n.Tr "datasets"}}

+
+ {{.i18n.Tr "repo.cloudbran1_tips"}} +
From 842cf579cc009be41ebd8422fd3b6c0ca3998743 Mon Sep 17 00:00:00 2001 From: hit172587zpz Date: Tue, 17 Aug 2021 17:09:22 +0800 Subject: [PATCH 2/3] fix issue 249 and issue 208 --- templates/user/settings/profile.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index f6fb7a7ae..ff677f35f 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -23,7 +23,8 @@
- + +
From 04af721a0b2e95c998514e29e856d87dfc67406c Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 19 Aug 2021 16:58:53 +0800 Subject: [PATCH 3/3] fix bug --- templates/repo/datasets/index.tmpl | 5 +---- web_src/js/components/MinioUploader.vue | 3 +++ web_src/js/components/ObsUploader.vue | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 164ca1f43..5ab2570c3 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -66,13 +66,10 @@
-
+

{{if eq .Type 0}}{{.i18n.Tr "repo.cloudbrain1"}}{{else}}{{.i18n.Tr "repo.cloudbrain2"}}{{end}}-{{.i18n.Tr "datasets"}}

-
- {{.i18n.Tr "repo.cloudbran1_tips"}} -
diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 243c627c5..d6756b25e 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -1,5 +1,8 @@