Merge pull request '删除云脑任务后保持筛选条件' (#1513) from fix-1509 into V20220228

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1513
Reviewed-by: ychao_1983 <ychao_1983@sina.com>

routers/repo/cloudbrain.go

@@ -582,12 +582,13 @@ func logErrorAndUpdateJobStatus(err error, taskInfo *models.Cloudbrain) {
 }
 
 func CloudBrainDel(ctx *context.Context) {
+	var listType = ctx.Query("debugListType")
 	if err := deleteCloudbrainJob(ctx); err != nil {
 		log.Error("deleteCloudbrainJob failed: %v", err, ctx.Data["msgID"])
 		ctx.ServerError(err.Error(), err)
 		return
 	}
-	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all")
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=" + listType)
 }
 
 func deleteCloudbrainJob(ctx *context.Context) error {

routers/repo/modelarts.go

@@ -418,6 +418,7 @@ func NotebookManage(ctx *context.Context) {
 
 func NotebookDel(ctx *context.Context) {
 	var jobID = ctx.Params(":jobid")
+	var listType = ctx.Query("debugListType")
 	task := ctx.Cloudbrain
 
 	if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped) {
@@ -443,7 +444,7 @@ func NotebookDel(ctx *context.Context) {
 		return
 	}
 
-	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all")
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=" + listType)
 }
 
 func TrainJobIndex(ctx *context.Context) {

templates/repo/debugjob/index.tmpl

@@ -366,7 +366,7 @@
                                         </form>
                                         <!-- 删除 -->
                                         <form  id="delForm-{{.JobID}}" action="{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.JobID}}/del" method="post">
-                                            <input type="hidden" name="debugListType" value="all">
+                                            <input type="hidden" name="debugListType" value="{{$.ListType}}">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
                                             <a id="model-delete-{{.JobID}}" class='ui basic {{if eq .Status "STOPPED" "FAILED" "START_FAILED"}}blue {{else}}disabled {{end}}button' onclick="assertDelete(this)" style="border-radius: .28571429rem;">