From 04c3ea18c28b62849748345fca4e0cc950e1e5f4 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Wed, 24 Nov 2021 20:46:37 +0800
Subject: [PATCH] fix bug

---
 modules/storage/obs.go                     | 4 ++--
 routers/api/v1/repo/modelarts.go           | 3 ++-
 routers/repo/modelarts.go                  | 9 ++++++++-
 templates/repo/modelarts/trainjob/new.tmpl | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/storage/obs.go b/modules/storage/obs.go
index 9ca26b357..39312bfde 100755
--- a/modules/storage/obs.go
+++ b/modules/storage/obs.go
@@ -176,10 +176,10 @@ func ObsModelDownload(JobName string, fileName string) (io.ReadCloser, error) {
 	}
 }
 
-func GetObsListObject(jobName, parentDir string, versionOutputPath string) ([]FileInfo, error) {
+func GetObsListObject(jobName, parentDir string) ([]FileInfo, error) {
 	input := &obs.ListObjectsInput{}
 	input.Bucket = setting.Bucket
-	input.Prefix = strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, versionOutputPath, parentDir), "/")
+	input.Prefix = strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, parentDir), "/")
 	strPrefix := strings.Split(input.Prefix, "/")
 	output, err := ObsCli.ListObjects(input)
 	fileInfos := make([]FileInfo, 0)
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index 9637bae99..c53e62efa 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -303,7 +303,8 @@ func ModelList(ctx *context.APIContext) {
 		return
 	}
 	VersionOutputPath := modelarts.GetVersionOutputPathByTotalVersionCount(task.TotalVersionCount)
-	models, err := storage.GetObsListObject(task.JobName, parentDir, VersionOutputPath)
+	parentDir = VersionOutputPath + "/" + parentDir
+	models, err := storage.GetObsListObject(task.JobName, parentDir)
 	if err != nil {
 		log.Info("get TrainJobListModel failed:", err)
 		ctx.ServerError("GetObsListObject:", err)
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 83498b70e..b0ef88ebc 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -369,6 +369,7 @@ func trainJobNewDataPrepare(ctx *context.Context) error {
 	}
 	ctx.Data["Branches"] = Branches
 	ctx.Data["BranchesCount"] = len(Branches)
+	ctx.Data["params"] = ""
 
 	configList, err := getConfigList(modelarts.PerPage, 1, modelarts.SortByCreateTime, "desc", "", modelarts.ConfigTypeCustom)
 	if err != nil {
@@ -450,16 +451,22 @@ func ErrorNewDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrainJob
 		ctx.ServerError("getConfigList failed:", err)
 		return err
 	}
+	var Parameters modelarts.Parameters
+	if err = json.Unmarshal([]byte(form.Params), &Parameters); err != nil {
+		ctx.ServerError("json.Unmarshal failed:", err)
+		return err
+	}
+	ctx.Data["params"] = Parameters.Parameter
 	ctx.Data["config_list"] = configList.ParaConfigs
 	ctx.Data["bootFile"] = form.BootFile
 	ctx.Data["uuid"] = form.Attachment
-	ctx.Data["params"] = form.Params
 	ctx.Data["branch_name"] = form.BranchName
 
 	return nil
 }
 
 func TrainJobNewVersion(ctx *context.Context) {
+
 	err := trainJobNewVersionDataPrepare(ctx)
 	if err != nil {
 		ctx.ServerError("get new train-job info failed", err)
diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl
index cb303ec4f..8513ee9ec 100755
--- a/templates/repo/modelarts/trainjob/new.tmpl
+++ b/templates/repo/modelarts/trainjob/new.tmpl
@@ -236,7 +236,7 @@
                     <span id="add_run_para" style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>
                     <input  id="store_run_para" type="hidden" name="run_para_list">
                     <div class="dynamic field" style="margin-top: 1rem;">
-                    <!-- {{if ne 0 (len .params)}}
+                    {{if ne 0 (len .params)}}
                         {{range $k ,$v := .params}}
                             <div class="two fields width85" id="para{{$k}}">
                                 <div class="field">
@@ -251,7 +251,7 @@
 
                             </div>
                         {{end}}
-                    {{end}} -->
+                    {{end}}
                     </div>
                 </div>