Merge branch 'V20220718' into zouap_static

models/cloudbrain.go

@@ -1802,7 +1802,7 @@ func GetBenchmarkCountByUserID(userID int64) (int, error) {
 
 func GetWaitingCloudbrainCount(cloudbrainType int, computeResource string, jobTypes ...JobType) (int64, error) {
 	sess := x.Where("status=? and type=?", JobWaiting, cloudbrainType)
-	if len(jobTypes) >= 0 {
+	if len(jobTypes) > 0 {
 		sess.In("JobType", jobTypes)
 	}
 	if computeResource != "" {

templates/repo/debugjob/index.tmpl

@@ -405,7 +405,7 @@
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
                                             <a id="ai-delete-{{.Cloudbrain.ID}}"
-                                                class='ui basic ai_delete {{if eq .Status "STOPPED" "FAILED" "START_FAILED"}}blue {{else}}disabled {{end}}button'
+                                                class='ui basic ai_delete {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "SUCCEEDED"}}blue {{else}}disabled {{end}}button'
                                                 style="border-radius: .28571429rem;">
                                                 {{$.i18n.Tr "repo.delete"}}
                                             </a>