From 35d72a631c70536c3b987a49177b7f2b2b8918ab Mon Sep 17 00:00:00 2001
From: hit172587zpz <hit172587zpz@163.com>
Date: Mon, 16 Aug 2021 15:41:37 +0800
Subject: [PATCH 1/3] fix bug 192

---
 templates/repo/cloudbrain/new.tmpl | 39 +++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl
index 4e533091e..7f3e35642 100755
--- a/templates/repo/cloudbrain/new.tmpl
+++ b/templates/repo/cloudbrain/new.tmpl
@@ -110,12 +110,13 @@
         <div class="rect5"></div>
     </div>
 </div>
+
 <div class="repository">
     {{template "repo/header" .}}
     <div class="repository new repo ui middle very relaxed page grid">
         <div class="column">
             {{template "base/alert" .}}
-            <form class="ui form" action="{{.Link}}" method="post">
+            <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <h3 class="ui top attached header">
                     {{.i18n.Tr "repo.cloudbrain.new"}}
@@ -192,15 +193,15 @@
 
                     <div class="inline required field">
                         <label>数据集存放路径</label>
-                        <input name="dataset_path" id="cloudbrain_dataset_path" value="{{.dataset_path}}" tabindex="3" autofocus required maxlength="255" readonly="readonly">
+                        <input name="dataset_path" id="cloudbrain_dataset_path" value="{{.dataset_path}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
                     </div>
                     <div class="inline required field">
                         <label>模型存放路径</label>
-                        <input name="model_path" id="cloudbrain_model_path" value="{{.model_path}}" tabindex="3" autofocus required maxlength="255" readonly="readonly">
+                        <input name="model_path" id="cloudbrain_model_path" value="{{.model_path}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
                     </div>
                     <div class="inline required field">
                         <label>代码存放路径</label>
-                        <input name="code_path" id="cloudbrain_code_path" value="{{.code_path}}" tabindex="3" autofocus required maxlength="255" readonly="readonly">
+                        <input name="code_path" id="cloudbrain_code_path" value="{{.code_path}}" tabindex="3" disabled autofocus required maxlength="255" readonly="readonly">
                     </div>
                     <div class="inline required field cloudbrain_benchmark">
                         <label>benchmark脚本存放路径</label>
@@ -217,13 +218,15 @@
 
                     <div class="inline field">
                         <label></label>
-                        <button class="ui green button" onclick="showmask()">
+                        <button class="ui green button" >
               {{.i18n.Tr "repo.cloudbrain.new"}}
             </button>
                         <a class="ui button" href="/">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                     </div>
                 </div>
             </form>
+
+            
         </div>
     </div>
 </div>
@@ -231,9 +234,31 @@
 <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
 <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
 <script>
-    // 点击按钮后遮罩层显示
-    function showmask() {
+
+    let url_href = window.location.pathname.split('create')[0]
+    $(".ui.button").attr('href',url_href)
+    let form = document.getElementById('form_id');
+    let value_image = $("input[name='image']").val()
+    console.log("value_image",$("input[name='image']").val())
+    form.onsubmit = function(e){
+        let value_task = $("input[name='job_name']").val()
+        
+        let value_image = $("input[name='image']").val()
+        let re = /^[a-zA-Z0-9-.]+$/
+        let flag = re.test(value_task)
+        if(!flag){
+            alert("任务名称只能包含字母,数字,'-',和'.'")
+            return false
+        }
+        if(!value_image){
+            alert("镜像为空")
+            return false
+        }
+        let min_value_task = value_task.toLowerCase()
+        console.log(min_value_task)
+        $("input[name='job_name']").attr("value",min_value_task)
         document.getElementById("mask").style.display = "block"
+        
     }
 
     // 页面加载完毕后遮罩层隐藏

From 15f2f408d566dd0e5638cd658cd42cd73b26c0c9 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 16 Aug 2021 16:40:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?#245=20=E5=88=9B=E5=BB=BA=E4=BA=91=E8=84=91?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8E=E7=AB=AF=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BB=BB=E5=8A=A1=E5=90=8D=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E8=BF=9D=E5=8F=8D=E7=BA=A6=E6=9D=9F=EF=BC=8C=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=BA=91=E8=84=91=E4=BB=BB=E5=8A=A1=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/repo/cloudbrain.go | 8 +++++++-
 routers/repo/modelarts.go  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index f6f796e14..1dff82c59 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -86,11 +86,17 @@ func cutString(str string, lens int) string {
 	return str[:lens]
 }
 
+func jobNamePrefixValid(s string) string {
+	lowStr := strings.ToLower(s)
+	re := regexp.MustCompile(`[^a-z0-9\\.\\-]+`)
+	return re.ReplaceAllString(lowStr, "")
+}
+
 func CloudBrainNew(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 
 	t := time.Now()
-	var jobName = cutString(ctx.User.Name, 5) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
+	var jobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["job_name"] = jobName
 
 	result, err := cloudbrain.GetImages()
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 5ee566322..f147a1f41 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -71,7 +71,7 @@ func ModelArtsNew(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 
 	t := time.Now()
-	var jobName = cutString(ctx.User.Name, 5) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
+	var jobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["job_name"] = jobName
 
 	attachs, err := models.GetModelArtsUserAttachments(ctx.User.ID)

From 75d87123d3a2110f189f7fe8a53fd820dddd78ea Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 16 Aug 2021 16:51:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?#=20import=E9=83=A8=E5=88=86=E6=BC=8F?=
 =?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 1dff82c59..c4b11d020 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"