#2988 npu调试任务详情页镜像字段悬浮提示文字不对

#2987 智算gpu训练任务详情页面AI引擎字段应叫镜像
	#2989 个人中心-云脑任务页面点击修改再点击取消应返回个人中心-云脑任务列表

templates/admin/cloudbrain/list.tmpl

@@ -290,7 +290,7 @@
                                     </div>
                                     <!-- 修改任务 -->
                                     {{if eq .JobType "TRAIN"}}
-                                    <div class="ui compact buttons">
+                                    <div class="ui compact buttons __btn_edit__">
                                         <a style="padding: 0.5rem 1rem;" class="ui basic blue button" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 2}}/grampus/train-job/{{.JobID}}{{end}}/create_version{{if .VersionName}}?version_name={{.VersionName}}{{end}}">
                                             {{$.i18n.Tr "repo.modelarts.modify"}}
                                         </a>
@@ -505,4 +505,16 @@
         </div>
     </div>
 </div>
+<script>
+    document.addEventListener('DOMContentLoaded', function() {
+        var editbtns = $('.__btn_edit__');
+        var curHref = window.location.href;
+        for (var i = 0, iLen = editbtns.length;  i < iLen; i++) {
+            var buttonEl = editbtns.eq(i).find('a');
+            var oHref = buttonEl.attr('href');
+            var hasSearch = oHref.split('?').length > 1;
+            buttonEl.attr('href', oHref + (hasSearch ? '&' : '?') + 'backurl=' + encodeURIComponent(curHref));
+        }
+    });
+</script>
 {{template "base/footer" .}}

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -232,7 +232,7 @@
                     <button class="ui create_train_job green button">
                         {{.i18n.Tr "repo.cloudbrain.new"}}
                     </button>
-                    <a class="ui button"
+                    <a class="ui button __btn-cancel-back__"
                         href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                 </div>
 
@@ -256,5 +256,9 @@
             memory: {{$.i18n.Tr "cloudbrain.memory"}},
             shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
         });
+        var backUrl = new URLSearchParams(window.location.search).get("backurl");
+        if (backUrl) {
+            $('.__btn-cancel-back__').attr('href', backUrl);
+        }
     })();
 </script>

templates/repo/grampus/trainjob/gpu/new.tmpl

@@ -205,7 +205,7 @@
                     <button class="ui create_train_job green button">
                     {{.i18n.Tr "repo.cloudbrain.new"}}
                     </button>
-                    <a class="ui button" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    <a class="ui button __btn-cancel-back__" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                 </div>
 
                 <!-- 模态框 -->
@@ -228,5 +228,9 @@
             memory: {{$.i18n.Tr "cloudbrain.memory"}},
             shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
         });
+        var backUrl = new URLSearchParams(window.location.search).get("backurl");
+        if (backUrl) {
+            $('.__btn-cancel-back__').attr('href', backUrl);
+        }
     })();
 </script>

templates/repo/grampus/trainjob/npu/new.tmpl

@@ -229,7 +229,7 @@
                     <button class="ui create_train_job green button">
                     {{.i18n.Tr "repo.cloudbrain.new"}}
                     </button>
-                    <a class="ui button" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    <a class="ui button __btn-cancel-back__" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                 </div>
 
                 <!-- 模态框 -->
@@ -252,5 +252,9 @@
             memory: {{$.i18n.Tr "cloudbrain.memory"}},
             shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
         });
+        var backUrl = new URLSearchParams(window.location.search).get("backurl");
+        if (backUrl) {
+            $('.__btn-cancel-back__').attr('href', backUrl);
+        }
     })();
 </script>

templates/repo/grampus/trainjob/show.tmpl

@@ -385,6 +385,26 @@
                                     <div class="ac-grid-col">
                                         <table class="ti-form">
                                             <tbody class="ti-text-form">
+                                                {{ if eq $.Spec.ComputeResource "GPU"}}
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "cloudbrain.mirror"}}
+                                                    </td>
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w">
+                                                            <span class="ui poping up clipboard" data-position="top center" id="clipboard-btn-image" style="cursor:pointer"
+                                                                data-clipboard-text="{{.EngineName}}"
+                                                                data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
+                                                                data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
+                                                                data-content="{{$.i18n.Tr "repo.copy_link"}}"
+                                                                data-variation="inverted tiny"
+                                                            >
+                                                                <span title="{{.EngineName}}">{{.EngineName}}</span>
+                                                            </span>
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                {{else}}
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}}
@@ -395,6 +415,7 @@
                                                         </div>
                                                     </td>
                                                 </tr>
+                                                {{end}}
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.modelarts.code_version"}}

templates/repo/modelarts/notebook/show.tmpl

@@ -364,9 +364,9 @@
                                                         <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
                                                             <span class="ui poping up clipboard" data-position="top center" id="clipboard-btn-image" style="cursor:pointer"
                                                                 data-clipboard-text="{{.Image}}"
-                                                                data-success="{{$.i18n.Tr "repo.copy_link_success"}}"
-                                                                data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
-                                                                data-content="{{$.i18n.Tr "repo.copy_link"}}"
+                                                                data-success="{{$.i18n.Tr "repo.copied"}}"
+                                                                data-error="{{$.i18n.Tr "repo.copied_error"}}"
+                                                                data-content="{{$.i18n.Tr "repo.copy"}}"
                                                                 data-variation="inverted tiny"
                                                             >
                                                             <span title="{{.Image}}">{{.Image}}</span>

templates/repo/modelarts/trainjob/index.tmpl

@@ -173,7 +173,7 @@
                                     <div class="ui compact buttons">
                                         {{$.CsrfTokenHtml}}
                                         {{if .CanModify}}
-                                        <a style="padding: 0.5rem 1rem;" class="ui basic blue button" href="{{if eq .Cloudbrain.Type 1}}{{$.Link}}/{{.JobID}}{{else if eq .Cloudbrain.Type 0}}{{$.RepoLink}}/cloudbrain/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 2}}{{$.RepoLink}}/grampus/train-job/{{.JobID}}{{end}}/create_version{{if .VersionName}}?version_name={{.VersionName}}{{end}}">
+                                        <a style="padding: 0.5rem 1rem;" class="ui basic blue button __btn_edit__" href="{{if eq .Cloudbrain.Type 1}}{{$.Link}}/{{.JobID}}{{else if eq .Cloudbrain.Type 0}}{{$.RepoLink}}/cloudbrain/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 2}}{{$.RepoLink}}/grampus/train-job/{{.JobID}}{{end}}/create_version{{if .VersionName}}?version_name={{.VersionName}}{{end}}">
                                             {{$.i18n.Tr "repo.modelarts.modify"}}
                                         </a>
                                         {{else}}
@@ -273,4 +273,14 @@ $('.ui.selection.dropdown').dropdown({
     }
     })
 })
+document.addEventListener('DOMContentLoaded', function() {
+    var editbtns = $('.__btn_edit__');
+    var curHref = window.location.href;
+    for (var i = 0, iLen = editbtns.length;  i < iLen; i++) {
+        var buttonEl = editbtns.eq(i);
+        var oHref = buttonEl.attr('href');
+        var hasSearch = oHref.split('?').length > 1;
+        buttonEl.attr('href', oHref + (hasSearch ? '&' : '?') + 'backurl=' + encodeURIComponent(curHref));
+    }
+});
 </script>

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -273,15 +273,19 @@
 {{template "base/footer" .}}
 <script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script src="{{StaticUrlPrefix}}/js/cloudbrainNew.js?v={{MD5 AppVer}}" type="text/javascript"></script>
-<script>
-    const params = new URLSearchParams(location.search)
-    let version_name = params.get('create_version')
-    if(params.get('path')){
-        $('.ui.cancel.button').attr('href',location.pathname.split('/create_version')[0])
-    }
-    $("#parents_version").val(version_name)
-    $("input[name=version_name]").attr('value',version_name)
+<script>    
     ;(function() {
+        var params = new URLSearchParams(location.search);
+        var version_name = params.get('version_name');
+        if(params.get('path')){
+            $('.ui.cancel.button').attr('href',location.pathname.split('/create_version')[0]);
+        }
+        if(params.get('backurl')){
+            $('.ui.cancel.button').attr('href',params.get('backurl'));
+        }
+        $("#parents_version").val(version_name);
+        $("input[name=version_name]").attr('value',version_name);
+
         var SPECS = {{ .Specs }};
         var showPoint = {{ .CloudBrainPaySwitch }};
         window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {

templates/user/dashboard/cloudbrains.tmpl

@@ -259,7 +259,7 @@
                                     {{end}}
                                     <!-- 修改任务 -->
                                     {{if eq .JobType "TRAIN"}}
-                                    <div class="ui compact buttons">
+                                    <div class="ui compact buttons __btn_edit__">
                                         <a style="padding: 0.5rem 1rem;" class="ui basic blue button" href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job/{{.JobID}}{{else if eq .Cloudbrain.Type 2}}/grampus/train-job/{{.JobID}}{{end}}/create_version{{if .VersionName}}?version_name={{.VersionName}}{{end}}">
                                             {{$.i18n.Tr "repo.modelarts.modify"}}
                                         </a>
@@ -453,4 +453,17 @@
         </div>
     </div>
 </div>
+
+<script>
+    document.addEventListener('DOMContentLoaded', function() {
+        var editbtns = $('.__btn_edit__');
+        var curHref = window.location.href;
+        for (var i = 0, iLen = editbtns.length;  i < iLen; i++) {
+            var buttonEl = editbtns.eq(i).find('a');
+            var oHref = buttonEl.attr('href');
+            var hasSearch = oHref.split('?').length > 1;
+            buttonEl.attr('href', oHref + (hasSearch ? '&' : '?') + 'backurl=' + encodeURIComponent(curHref));
+        }
+    });
+</script>
 {{template "base/footer" .}}