Merge branch 'pretrainmodel' of git.openi.org.cn:OpenI/aiforge into pretrainmodel

routers/repo/grampus.go

@@ -146,13 +146,15 @@ func grampusTrainJobNewDataPrepare(ctx *context.Context, processType string) err
 		ctx.Data["branch_name"] = ctx.Cloudbrain.BranchName
 		ctx.Data["engine_name"] = ctx.Cloudbrain.EngineName
 		ctx.Data["WorkServerNumber"] = ctx.Cloudbrain.WorkServerNumber
-		ctx.Data["image"] = ctx.Cloudbrain.Image
+		if ctx.Cloudbrain.Image != "" {
+			ctx.Data["image"] = ctx.Cloudbrain.Image
+		} else {
+			ctx.Data["image"] = ctx.Cloudbrain.EngineName
+		}
 		ctx.Data["dataset_name"] = ctx.Cloudbrain.DatasetName
 		ctx.Data["model_name"] = ctx.Cloudbrain.ModelName
 
 		ctx.Data["model_version"] = ctx.Cloudbrain.ModelVersion
-		ctx.Data["dataset_name"] = ctx.Cloudbrain.DatasetName
-		ctx.Data["model_name"] = ctx.Cloudbrain.ModelName
 		ctx.Data["ckpt_name"] = ctx.Cloudbrain.CkptName
 		ctx.Data["label_names"] = ctx.Cloudbrain.LabelName
 		ctx.Data["PreTrainModelUrl"] = ctx.Cloudbrain.PreTrainModelUrl

templates/repo/cloudbrain/trainjob/versionnew.tmpl

@@ -70,7 +70,7 @@
 <div class="repository">
     {{template "repo/header" .}}
     <div class="ui container">
-        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true" data-dataset-uuid="{{.uuid}}" data-dataset-name="{{.dataset_name}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>
+        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true" data-dataset-uuid="{{.attachment}}" data-dataset-name="{{.dataset_name}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>
         {{template "base/alert" .}}
         <h4 class="ui top attached header">
             {{.i18n.Tr "repo.modelarts.train_job.new"}}