Merge pull request '0415.patch合入V20220428' (#1991) from 0415.merge into V20220428

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1991

models/cloudbrain.go

@@ -1631,12 +1631,12 @@ func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
 	var err error
 	condition := "cloudbrain.user_id = `user`.id"
 	if len(opts.Keyword) == 0 {
-		count, err = sess.Where(cond).Count(new(Cloudbrain))
+		count, err = sess.Unscoped().Where(cond).Count(new(Cloudbrain))
 	} else {
 		lowerKeyWord := strings.ToLower(opts.Keyword)
 
 		cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}, builder.Like{"LOWER(cloudbrain.display_job_name)", lowerKeyWord}, builder.Like{"`user`.lower_name", lowerKeyWord}))
-		count, err = sess.Table(&Cloudbrain{}).Where(cond).
+		count, err = sess.Table(&Cloudbrain{}).Unscoped().Where(cond).
 			Join("left", "`user`", condition).Count(new(CloudbrainInfo))
 
 	}

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -23,7 +23,7 @@ func DownloadCloudBrainBoard(ctx *context.Context) {
 	_, total, err := models.CloudbrainAll(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
-			PageSize: 1,
+			PageSize: pageSize,
 		},
 		Type:         models.TypeCloudBrainAll,
 		NeedRepoInfo: false,

routers/user/home.go

@@ -804,6 +804,7 @@ func Cloudbrains(ctx *context.Context) {
 	repos, _, err := models.SearchRepository(&models.SearchRepoOptions{
 		Actor:   ctx.User,
 		OwnerID: ctxUser.ID,
+		Private: true,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)

templates/admin/cloudbrain/list.tmpl

@@ -162,9 +162,9 @@
                                         {{end}}
                                     </div>
                                     <!-- 删除任务 -->
-                                    <form class="ui compact buttons" id="delForm-{{$JobID}}" action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}/train-job{{end}}/{{$JobID}}/del?isadminpage=true' method="post">
+                                    <form class="ui compact buttons" id="delForm-{{$JobID}}" action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}/cloudbrain{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}/train-job{{end}}/{{$JobID}}/del?isadminpage=true' method="post">
                                         {{$.CsrfTokenHtml}}
-                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{$JobID}}" data-repopath="{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}/del_version?isadminpage=true"  data-version="{{.VersionName}}" class="ui basic ai_delete blue button" style="border-radius: .28571429rem;">
+                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{$JobID}}" data-repopath="{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}/del_version?isadminpage=true"  data-version="" class="ui basic ai_delete blue button" style="border-radius: .28571429rem;">
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                     </form>

templates/user/dashboard/cloudbrains.tmpl

@@ -147,9 +147,9 @@
                                         {{end}}
                                     </div>
                                     <!-- 删除任务 -->
-                                    <form class="ui compact buttons" id="delForm-{{$JobID}}" action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/train-job{{else}}/cloudbrain/train-job{{end}}{{end}}/{{$JobID}}/del?ishomepage=true' method="post">
+                                    <form class="ui compact buttons" id="delForm-{{$JobID}}" action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}/cloudbrain{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/train-job{{else}}/cloudbrain/train-job{{end}}{{end}}/{{$JobID}}/del?ishomepage=true' method="post">
                                         {{$.CsrfTokenHtml}}
-                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{$JobID}}" data-repopath="{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}/del_version?ishomepage=true"  data-version="{{.VersionName}}" class="ui basic ai_delete blue button" style="border-radius: .28571429rem;">
+                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{$JobID}}" data-repopath="{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}/del_version?ishomepage=true"  data-version="" class="ui basic ai_delete blue button" style="border-radius: .28571429rem;">
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                     </form>