diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bff640f61..fd439c4d1 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -493,6 +493,13 @@ account_link = Linked Accounts organization = Organizations uid = Uid u2f = Security Keys +bind_weChat = Bind WeChat +bind_account_information = Bind account information +bind_time = Bind Time +wechat = Wechat +Unbind = Unbind +unbind_wechat = Are you sure you want to unbind WeChat? +unbind_computing = After unbundling, the qizhi computing power environment will not be available public_profile = Public Profile profile_desc = Your email address will be used for notifications and other operations. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index c7b214c9d..0f94f1d1d 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -496,6 +496,13 @@ account_link=已绑定帐户 organization=组织 uid=用户 ID u2f=安全密钥 +bind_weChat = 微信绑定 +bind_account_information = 绑定账号信息 +bind_time = 绑定时间 +wechat = 微信 +unbind = 解除绑定 +unbind_wechat = 确定要解绑微信? +unbind_computing = 解绑后将无法使用启智算力环境 public_profile=公开信息 profile_desc=您的电子邮件地址将用于通知和其他操作。 diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 880d28dcf..4cde5d40d 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -351,6 +351,7 @@ func CloudBrainShow(ctx *context.Context) { func cloudBrainShow(ctx *context.Context, tpName base.TplName) { ctx.Data["PageIsCloudBrain"] = true var jobName = ctx.Params(":jobname") + debugListType := ctx.Query("debugListType") task, err := models.GetCloudbrainByName(jobName) if err != nil { ctx.Data["error"] = err.Error() @@ -425,6 +426,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) { version_list_task := make([]*models.Cloudbrain, 0) version_list_task = append(version_list_task, task) ctx.Data["version_list_task"] = version_list_task + ctx.Data["debugListType"] = debugListType ctx.HTML(200, tpName) } diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index ebba2e95a..6c586d38e 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -91,6 +91,7 @@ func DebugJobIndex(ctx *context.Context) { ctx.Data["Tasks"] = ciTasks ctx.Data["CanCreate"] = cloudbrain.CanCreateOrDebugJob(ctx) ctx.Data["RepoIsEmpty"] = repo.IsEmpty + ctx.Data["debugListType"] = debugListType ctx.HTML(200, tplDebugJobIndex) } @@ -227,6 +228,7 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm func NotebookShow(ctx *context.Context) { ctx.Data["PageIsCloudBrain"] = true + debugListType := ctx.Query("debugListType") var jobID = ctx.Params(":jobid") task, err := models.GetCloudbrainByJobID(jobID) @@ -271,6 +273,7 @@ func NotebookShow(ctx *context.Context) { ctx.Data["jobID"] = jobID ctx.Data["jobName"] = task.JobName ctx.Data["result"] = result + ctx.Data["debugListType"] = debugListType ctx.HTML(200, tplModelArtsNotebookShow) } diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 0735c593b..f7fcda2bc 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -254,7 +254,7 @@ - {{.i18n.Tr "repo.cloudbrain.cancel"}} + {{.i18n.Tr "repo.cloudbrain.cancel"}} diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 921ba179e..7600907e7 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -11,7 +11,7 @@ {{.i18n.Tr "repo.cloudbrain"}}
/
- + {{$.i18n.Tr "repo.modelarts.notebook"}}
/
@@ -98,4 +98,3 @@ {{template "base/footer" .}} - diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index b624349cd..7150cc11e 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -287,7 +287,7 @@
- + {{.JobName}}
@@ -485,7 +485,7 @@ let getParam=getQueryVariable('debugListType') let dropdownValue = ['all','',false].includes(getParam)? '全部' : getParam - localStorage.setItem('all',location.href) + // localStorage.setItem('all',location.href) function getQueryVariable(variable) { let query = window.location.search.substring(1); @@ -505,6 +505,7 @@ }) $('.ui.selection.dropdown').dropdown({ onChange:function(value){ + location.href = `${url}/debugjob?debugListType=${value}` } }) diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index fb6e3c9be..367c10906 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -101,7 +101,7 @@ - {{.i18n.Tr "repo.cloudbrain.cancel"}} + {{.i18n.Tr "repo.cloudbrain.cancel"}}
@@ -171,11 +171,8 @@ if(option.innerText===inputValue){ hiddenInput.value = option.getAttribute('data-value'); - break - + break } } - - }) \ No newline at end of file diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 787b20a99..93c35cca4 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -11,7 +11,7 @@ {{.i18n.Tr "repo.cloudbrain"}}
/
- + {{$.i18n.Tr "repo.modelarts.notebook"}}
/
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index d42415493..f253bf3b2 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -104,41 +104,35 @@

- 微信绑定 + {{$.i18n.Tr "settings.bind_weChat"}}

{{if not .SignedUser.IsBindWechat}}
- 绑定微信 + {{$.i18n.Tr "settings.bind_weChat"}}
{{else}}
- - @@ -147,13 +141,13 @@ {{end}} diff --git a/web_src/js/index.js b/web_src/js/index.js index e41f79fd7..902750c5b 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -4179,9 +4179,9 @@ $('.question.circle.icon.cloudbrain-question').hover(function(){ }); //云脑详情页面跳转回上一个页面 -$(".section.backTodeBug").attr("href",localStorage.getItem('all')) +// $(".section.backTodeBug").attr("href",localStorage.getItem('all')) //新建调试取消跳转 -$(".ui.button.cancel").attr("href",localStorage.getItem('all')) +// $(".ui.button.cancel").attr("href",localStorage.getItem('all')) function initcreateRepo(){ let timeout;
- 绑定账号信息 + {{$.i18n.Tr "settings.bind_account_information"}} - 绑定时间 + {{$.i18n.Tr "settings.bind_time"}} - 操作 + {{$.i18n.Tr "repo.cloudbrain_operate"}}
- 微信 + {{$.i18n.Tr "settings.wechat"}} {{TimeSinceUnix1 .SignedUser.WechatBindUnix}}