From 26cbbbaf384845ce7fd47b23fb1962cf09acc180 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 19 Sep 2022 10:57:25 +0800
Subject: [PATCH] fix issue

---
 templates/repo/cloudbrain/trainjob/new.tmpl   | 47 +------------------
 .../repo/grampus/trainjob/gpu/versionnew.tmpl |  2 -
 templates/repo/modelarts/trainjob/new.tmpl    |  2 +-
 .../repo/modelarts/trainjob/version_new.tmpl  |  2 +-
 4 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl
index 427d32995..6835eb5f2 100755
--- a/templates/repo/cloudbrain/trainjob/new.tmpl
+++ b/templates/repo/cloudbrain/trainjob/new.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"}}
@@ -176,28 +176,6 @@
                         <option name="job_type" value="TRAIN">TRAIN</option>
                     </select>
                 </div>
-                <!--<div class="required min_title inline field">
-                    <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
-                    <select id="cloudbrain_gpu_type" class="ui search width806 dropdown gpu-type" placeholder="选择GPU类型"
-                        style='width:385px' name="gpu_type">
-                        {{if .gpu_type}}
-                            {{range .train_gpu_types}}
-                                {{if eq $.gpu_type .Queue}}
-                                    <option value="{{.Queue}}">{{.Value}}</option>
-                                {{end}}
-                            {{end}}
-                            {{range .train_gpu_types}}
-                                {{if ne $.gpu_type .Queue}}
-                                    <option value="{{.Queue}}">{{.Value}}</option>
-                                {{end}}
-                            {{end}}
-                        {{else}}
-                            {{range .train_gpu_types}}
-                                <option value="{{.Queue}}">{{.Value}}</option>
-                            {{end}}
-                        {{end}}
-                    </select>
-                </div>-->
                 <div id="images-new-cb">
 
                 </div>
@@ -232,29 +210,6 @@
 
                     </div>
                 </div>
-                <!--<div class="required min_title inline field">
-                    <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
-                    <select id="cloudbrain_resource_spec" class="ui search dropdown" placeholder="选择资源规格"
-                        style='width:385px' name="resource_spec_id">
-                        {{if .resource_spec_id}}
-                            {{range .train_resource_specs}}
-                                {{if eq $.resource_spec_id .Id}}
-                                    <option value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}：{{.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{.ShareMemMiB}}</option>
-                                {{end}}
-                            {{end}}
-                            {{range .train_resource_specs}}
-                                {{if ne $.resource_spec_id .Id}}
-                                    <option value="{{.Id}}">{{$.i18n.Tr "cloudbrain.gpu_num"}}：{{.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{.ShareMemMiB}}</option>
-                                {{end}}
-                            {{end}}
-                        {{else}}
-                            {{range .train_resource_specs}}
-                            <option name="resource_spec_id" value="{{.Id}}">
-                                {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{.ShareMemMiB}}</option>
-                            {{end}}
-                        {{end}}
-                    </select>
-                </div>-->
 
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
diff --git a/templates/repo/grampus/trainjob/gpu/versionnew.tmpl b/templates/repo/grampus/trainjob/gpu/versionnew.tmpl
index 53dbf51fe..b9803d77f 100644
--- a/templates/repo/grampus/trainjob/gpu/versionnew.tmpl
+++ b/templates/repo/grampus/trainjob/gpu/versionnew.tmpl
@@ -72,8 +72,6 @@
             <form id="form_id" class="ui form" action="{{.Link}}?compute_resource=CPU/GPU" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
-                <input type="hidden" id="ai_engine_name" name="engine_name" value="">
-                <input type="hidden" id="ai_flavor_name" name="flavor_name" value="">
                 <input type="hidden" id="ai_image_name" value="{{.image}}">
                 <h4 class="train-job-title ui header ">{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:</h4>
                 <div class="required min_title inline field">
diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl
index 4acbdfd27..e7bb8bf57 100755
--- a/templates/repo/modelarts/trainjob/new.tmpl
+++ b/templates/repo/modelarts/trainjob/new.tmpl
@@ -215,7 +215,7 @@
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
                     <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;">
+                    <div class="dynamic field" style="margin-top: 1rem;" data-params="{{.run_para_list}}">
                     </div>
                 </div>
 
diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl
index 6d2383114..8b4e51080 100644
--- a/templates/repo/modelarts/trainjob/version_new.tmpl
+++ b/templates/repo/modelarts/trainjob/version_new.tmpl
@@ -55,7 +55,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}}"></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}}"></div>
         {{template "base/alert" .}}
         <h4 class="ui top attached header">
             {{.i18n.Tr "repo.modelarts.train_job.new"}}