diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ed8700ed2..61a233589 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -768,6 +768,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 554c4275d..89db6536c 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -770,6 +770,7 @@ cloudbrain2=云脑2 cloudbrain_selection=云脑选择 cloudbrain_platform_selection=选择您准备使用的云脑平台: confirm_choice=确定 +cloudbran1_tips=只有zip格式的数据集才能发起云脑任务 template.items=模板选项 template.git_content=Git数据(默认分支) diff --git a/routers/user/setting/profile.go b/routers/user/setting/profile.go index a385f2cac..3333a8cc4 100755 --- a/routers/user/setting/profile.go +++ b/routers/user/setting/profile.go @@ -90,23 +90,12 @@ func ProfilePost(ctx *context.Context, form auth.UpdateProfileForm) { } ctx.User.FullName = form.FullName - ctx.User.Email = form.Email + ctx.User.KeepEmailPrivate = form.KeepEmailPrivate ctx.User.Website = form.Website ctx.User.Location = form.Location ctx.User.Language = form.Language ctx.User.Description = form.Description - isUsed, err := models.IsEmailUsed(form.Email) - if err != nil { - ctx.ServerError("IsEmailUsed", err) - return - } - - if isUsed { - ctx.Flash.Error(ctx.Tr("form.email_been_used")) - ctx.Redirect(setting.AppSubURL + "/user/settings") - return - } if err := models.UpdateUserSetting(ctx.User); err != nil { if _, ok := err.(models.ErrEmailAlreadyUsed); ok { 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 @@
- + +
diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 243c627c5..8b23fe7de 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -1,5 +1,8 @@