From a00349f3e0a307f486f94425aa4a5caa9cf4e7c9 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Thu, 21 Oct 2021 10:51:38 +0800
Subject: [PATCH 1/3] del

---
 routers/repo/cloudbrain.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 0c83c99bd..ccf2b879d 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -474,7 +474,7 @@ func CloudBrainDel(ctx *context.Context) {
 		return
 	}
 
-	if task.Status != string(models.JobStopped) {
+	if task.Status != string(models.JobStopped) && task.Status != string(models.JobFailed){
 		log.Error("the job(%s) has not been stopped", task.JobName, ctx.Data["msgID"])
 		ctx.ServerError("the job has not been stopped", errors.New("the job has not been stopped"))
 		return

From 1d29fce90a4b82dd029b37d32cf49322e75f9bd3 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Thu, 21 Oct 2021 11:52:15 +0800
Subject: [PATCH 2/3] fix issue #384

---
 templates/explore/dataset_list.tmpl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/explore/dataset_list.tmpl b/templates/explore/dataset_list.tmpl
index 48ae78127..7abc03363 100755
--- a/templates/explore/dataset_list.tmpl
+++ b/templates/explore/dataset_list.tmpl
@@ -29,8 +29,12 @@
             {{.Repo.OwnerName}} / {{.Title}}
           </a>
           <div class="ui right metas">
-            <span class="text grey">{{svg "octicon-tasklist" 16}} {{$.i18n.Tr (printf "dataset.task.%s" .Task)}}</span>
-            <span class="text grey">{{svg "octicon-tag" 16}}{{$.i18n.Tr (printf "dataset.category.%s" .Category)}}</span>
+            {{if .Task}}
+              <span class="text grey">{{svg "octicon-tasklist" 16}} {{$.i18n.Tr (printf "dataset.task.%s" .Task)}}</span>
+            {{end}}
+            {{if .Category}}
+              <span class="text grey">{{svg "octicon-tag" 16}}{{$.i18n.Tr (printf "dataset.category.%s" .Category)}}</span>
+            {{end}}
             <span class="text grey">{{svg "octicon-flame" 16}} {{.DownloadTimes}}</span>
           </div>
         </div>

From f8e34d09784d1bdf5a2745953efaf8b4ca149f6c Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Thu, 21 Oct 2021 12:04:52 +0800
Subject: [PATCH 3/3] fix issue #473 tips

---
 templates/repo/cloudbrain/new.tmpl | 4 ++--
 templates/repo/modelarts/new.tmpl  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl
index 42a0e55ad..f108f5a5f 100755
--- a/templates/repo/cloudbrain/new.tmpl
+++ b/templates/repo/cloudbrain/new.tmpl
@@ -120,7 +120,7 @@
     <div class="repository new repo ui middle very relaxed page grid">
         <div class="column">
             {{template "base/alert" .}}
-            <div class="ui positive message" id="messageInfo">
+            <div class="ui negative message" id="messageInfo">
                 <p></p>
             </div>
             <form id="form_id" class="ui form" action="{{.Link}}" method="post">
@@ -263,7 +263,7 @@
         let flag = re.test(value_task)
         if(!flag){
             $('#messageInfo').css('display','block')
-            let str = '只能以小写字母或数字开头且只包含小写字母、数字、_和-、最长36个字符,不能下划线(-)结尾。'
+            let str = '只能以小写字母或数字开头且只包含小写字母、数字、_和-，不能以_结尾，最长36个字符。'
             $('#messageInfo p').text(str)
             return false
         }
diff --git a/templates/repo/modelarts/new.tmpl b/templates/repo/modelarts/new.tmpl
index 4aa329277..da0b83059 100755
--- a/templates/repo/modelarts/new.tmpl
+++ b/templates/repo/modelarts/new.tmpl
@@ -100,7 +100,7 @@
     <div class="repository new repo ui middle very relaxed page grid">
         <div class="column">
             {{template "base/alert" .}}
-            <div class="ui positive message" id="messageInfo">
+            <div class="ui negative message" id="messageInfo">
                     <p></p>
             </div>
             <form class="ui form" id="form_id" action="{{.Link}}" method="post">