Merge pull request 'fix-1477' (#1585) from fix-1477 into V20220228

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1585
Reviewed-by: wangjr <wangjr@pcl.ac.cn>

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.

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=您的电子邮件地址将用于通知和其他操作。

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)
 }
 

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)
 }
 

templates/repo/cloudbrain/new.tmpl

@@ -254,7 +254,7 @@
                         <button class="ui green button" >
               {{.i18n.Tr "repo.cloudbrain.new"}}
             </button>
-                        <a class="ui button cancel" href="">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                        <a class="ui button cancel" href="{{.RepoLink}}/debugjob?debugListType=all">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                     </div>
                 </div>
             </form>

templates/repo/cloudbrain/show.tmpl

@@ -11,7 +11,7 @@
                 {{.i18n.Tr "repo.cloudbrain"}}
             </a>
             <div class="divider"> / </div>
-            <a class="section backTodeBug" href="{{.RepoLink}}/debugjob?debugListType=CPU/GPU">
+            <a class="section backTodeBug" href="{{.RepoLink}}/debugjob?debugListType={{if eq $.debugListType "NPU"}}NPU{{else if eq $.debugListType "CPU/GPU"}}CPU/GPU{{else}}all{{end}}">
                 {{$.i18n.Tr "repo.modelarts.notebook"}}
             </a>
             <div class="divider"> / </div>
@@ -98,4 +98,3 @@
   </div>
 </div>
 {{template "base/footer" .}}
-

templates/repo/debugjob/index.tmpl

@@ -287,7 +287,7 @@
                             <div class="row">
                                 <!-- 任务名 -->
                                 <div class="four wide column">
-                                    <a class="title" href='{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain/{{.JobName}}{{else}}{{$.RepoLink}}/modelarts/notebook/{{.JobID}}{{end}}'  title="{{.JobName}}" style="font-size: 14px;">
+                                    <a class="title" href='{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain/{{.JobName}}{{else}}{{$.RepoLink}}/modelarts/notebook/{{.JobID}}{{end}}?debugListType={{$.debugListType}}'  title="{{.JobName}}" style="font-size: 14px;">
                                         <span class="fitted text_over" style="width: 90%;vertical-align: middle;">{{.JobName}}</span>
                                     </a>
                                 </div>
@@ -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}`
             }
         })

templates/repo/modelarts/notebook/new.tmpl

@@ -101,7 +101,7 @@
                         <button class="ui green button">
               {{.i18n.Tr "repo.cloudbrain.new"}}
             </button>
-                        <a class="ui button cancel" href="">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                        <a class="ui button cancel" href="{{.RepoLink}}/debugjob?debugListType=all">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                     </div>
                 </div>
             </form>
@@ -171,11 +171,8 @@
             if(option.innerText===inputValue){
                 
                 hiddenInput.value = option.getAttribute('data-value');
-                break
-            
+                break   
             }
         }
-
-
     })
 </script>

templates/repo/modelarts/notebook/show.tmpl

@@ -11,7 +11,7 @@
                   {{.i18n.Tr "repo.cloudbrain"}}
               </a>
               <div class="divider"> / </div>
-              <a class="section backTodeBug" href="{{.RepoLink}}/debugjob?debugListType=NPU">
+              <a class="section backTodeBug" href="{{.RepoLink}}/debugjob?debugListType={{if eq $.debugListType "NPU"}}NPU{{else if eq $.debugListType "CPU/GPU"}}CPU/GPU{{else}}all{{end}}">
                   {{$.i18n.Tr "repo.modelarts.notebook"}}
               </a>
               <div class="divider"> / </div>

templates/user/settings/profile.tmpl

@@ -104,41 +104,35 @@
 			</form>
 		</div>
 		<h4 class="ui top attached header">
-			微信绑定<!-- {{.i18n.Tr "settings.avatar"}} -->
+			{{$.i18n.Tr "settings.bind_weChat"}}
 		</h4>
 		{{if not .SignedUser.IsBindWechat}}
 		<div class="ui attached segment">
-			<a href="/authentication/wechat/bind?redirect_to=/user/settings" class="ui green button">绑定微信</a>
+			<a href="/authentication/wechat/bind?redirect_to=/user/settings" class="ui green button">{{$.i18n.Tr "settings.bind_weChat"}}</a>
 		</div>
 		{{else}}
 		<div class="ui attached segment">
 			<table class="ui celled striped table provider titleless">
 				<thead>
 					<th class="center aligned">
-						绑定账号信息
+						{{$.i18n.Tr "settings.bind_account_information"}}
 					</th>
-					<!-- <th class="center aligned">
-						详情
-					</th> -->
 					<th class="center aligned">
-						绑定时间
+						{{$.i18n.Tr "settings.bind_time"}}
 					</th>
 					<th class="center aligned">
-						操作
+						{{$.i18n.Tr "repo.cloudbrain_operate"}}
 					</th>
 				</thead>
 				<tbody>
 					<td class="center aligned">
-						微信
+						{{$.i18n.Tr "settings.wechat"}}
 					</td>
-					<!-- <td class="center aligned">
-						<img class="ui avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}">{{.SignedUser.Name}}
-					</td> -->
 					<td class="center aligned">
 						{{TimeSinceUnix1 .SignedUser.WechatBindUnix}}
 					<td class="center aligned">
 						<div>
-							<a class="ui inverted orange button " onclick="showcreate(this)" href="javascript: void(0)">解除绑定</a>
+							<a class="ui inverted orange button " onclick="showcreate(this)" href="javascript: void(0)">{{$.i18n.Tr "settings.unbind"}}</a>
 						</div>
 					</td>
 				</tbody>
@@ -147,13 +141,13 @@
 		{{end}}
 	</div>
 	<div class="ui mini modal wx-unbind">
-		<div class="header">确定要解绑微信?</div>
+		<div class="header">{{$.i18n.Tr "settings.unbind_wechat"}}</div>
 		<div class="content">
-			<p>解绑后将无法使用云脑计算资源</p>
+			<p>{{$.i18n.Tr "settings.unbind_computing"}}</p>
 		</div>
 		<div class="actions">
-			<div class="ui blank cancel button">取消</div>
-			<div class="ui green approve button">确定</div>
+			<div class="ui blank cancel button">{{$.i18n.Tr "cancel"}}</div>
+			<div class="ui green approve button">{{$.i18n.Tr "repo.confirm_choice"}}</div>
 		</div>
 	</div>
 </div>

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;