From 3dc520087a264ee799152af66647dd9e40d1851a Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 22 Apr 2022 17:30:08 +0800 Subject: [PATCH 1/4] fix issue --- templates/admin/dataset/list.tmpl | 4 ++-- templates/explore/datasets.tmpl | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/templates/admin/dataset/list.tmpl b/templates/admin/dataset/list.tmpl index 3d32ec7a7..ca1ca27af 100644 --- a/templates/admin/dataset/list.tmpl +++ b/templates/admin/dataset/list.tmpl @@ -27,7 +27,7 @@ {{range .Datasets}} {{.ID}} - {{.Title}}{{if .Recommend}}{{end}} + {{.Title}}{{if .Recommend}}{{end}} {{.CreatedUnix.FormatShort}} {{if .Recommend}}{{$.i18n.Tr "admin.datasets.unrecommend"}}{{else}}{{$.i18n.Tr "admin.datasets.recommend"}}{{end}} @@ -40,4 +40,4 @@ {{template "base/paginate" .}} -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index 3ffb0ec73..94a843d74 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -145,8 +145,7 @@
- {{.Repo.OwnerName}} / {{.Repo.Alias}}{{if .Recommend}}{{end}} - + {{.Repo.OwnerName}} / {{.Repo.Alias}} {{if $.IsSigned}}
@@ -163,7 +162,7 @@ {{end}}
-
{{.Title}}
+
{{.Title}}{{if .Recommend}}{{end}}
{{if or (.Category) (.Task) (.License)}}
{{if .Category}} From 74fe35720148914b79364ac5ecc93c838114ce12 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Sun, 24 Apr 2022 11:15:45 +0800 Subject: [PATCH 2/4] fix issue --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/admin/dataset/list.tmpl | 10 +++- templates/admin/dataset/search.tmpl | 27 ++++++----- templates/explore/datasets.tmpl | 15 +++--- web_src/js/index.js | 74 ++++++++++++++++++++++++----- 6 files changed, 96 insertions(+), 32 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f53bea7b1..8b78d369a 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2512,6 +2512,7 @@ datasets.name=name datasets.private=Private datasets.recommend=Set recommend datasets.unrecommend=Set unrecommend +datasets.only_recommend = Only show platform recommendations cloudbrain.all_task_types=All Task Types cloudbrain.all_computing_resources=All Computing Resources diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index c82347d5e..ee57fd613 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2522,6 +2522,7 @@ datasets.name=名称 datasets.private=私有 datasets.recommend=设为推荐 datasets.unrecommend=取消推荐 +datasets.only_recommend = 仅显示平台推荐 cloudbrain.all_task_types=全部任务类型 cloudbrain.all_computing_resources=全部计算资源 diff --git a/templates/admin/dataset/list.tmpl b/templates/admin/dataset/list.tmpl index ca1ca27af..9e4e72b68 100644 --- a/templates/admin/dataset/list.tmpl +++ b/templates/admin/dataset/list.tmpl @@ -4,7 +4,6 @@
{{template "base/alert" .}}

{{.i18n.Tr "admin.datasets.dataset_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) @@ -12,6 +11,15 @@
{{template "admin/dataset/search" .}}
+
+
+
+ + +
+
+
+
diff --git a/templates/admin/dataset/search.tmpl b/templates/admin/dataset/search.tmpl index 5d01d836c..749065401 100644 --- a/templates/admin/dataset/search.tmpl +++ b/templates/admin/dataset/search.tmpl @@ -6,18 +6,18 @@
- {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.moststars"}} - {{.i18n.Tr "repo.issues.filter_sort.feweststars"}} - {{.i18n.Tr "repo.issues.filter_sort.mostforks"}} - {{.i18n.Tr "repo.issues.filter_sort.fewestforks"}} - {{.i18n.Tr "repo.issues.label.filter_sort.by_size"}} - {{.i18n.Tr "repo.issues.label.filter_sort.reverse_by_size"}} + {{.i18n.Tr "repo.issues.filter_sort.oldest"}} + {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.moststars"}} + {{.i18n.Tr "repo.issues.filter_sort.feweststars"}} + {{.i18n.Tr "repo.issues.filter_sort.mostforks"}} + {{.i18n.Tr "repo.issues.filter_sort.fewestforks"}} + {{.i18n.Tr "repo.issues.label.filter_sort.by_size"}} + {{.i18n.Tr "repo.issues.label.filter_sort.reverse_by_size"}}
@@ -27,3 +27,6 @@ + \ No newline at end of file diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index 94a843d74..7b2577900 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -121,12 +121,12 @@
- {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}} - {{.i18n.Tr "repo.issues.filter_sort.moststars"}} + {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.filter_sort.oldest"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}} + {{.i18n.Tr "repo.issues.filter_sort.moststars"}}
@@ -140,6 +140,7 @@ {{end}}
+ 仅显示平台推荐
{{range $k, $v :=.Datasets}}
@@ -162,7 +163,7 @@ {{end}}
-
{{.Title}}{{if .Recommend}}{{end}}
+
{{.Title}}{{if .Recommend}}{{end}}
{{if or (.Category) (.Task) (.License)}}
{{if .Category}} diff --git a/web_src/js/index.js b/web_src/js/index.js index c558e7624..ecd637ad0 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3700,6 +3700,37 @@ function initVueEditAbout() { } function initVueDataset() { + if($('#dataset_check').length){ + if(location.search.indexOf('recommend=true')!==-1){ + $('#dataset_check').checkbox('set checked') + }else{ + $('#dataset_check').checkbox('set unchecked') + } + $('#dataset_check').checkbox({ + onChecked: function() { + if(location.search){ + const params = new URLSearchParams(location.search) + if(params.has('recommend')){ + params.delete('recommend') + location.href = AppSubUrl + location.pathname + '?' + params.toString() + '&recommend=true' + }else{ + location.href = `${window.config.AppSubUrl}/admin/datasets${location.search}&recommend=true` + } + }else{ + location.href = `${window.config.AppSubUrl}/admin/datasets?recommend=true` + } + }, + onUnchecked: function() { + if(location.search=='?recommend=true'){ + location.href = AppSubUrl + location.pathname + }else{ + const params = new URLSearchParams(location.search) + params.delete('recommend') + location.href = AppSubUrl + location.pathname + '?' + params.toString() + } + }, + }) + } $('.set_dataset').on('click', function(){ const $this = $(this); let link = $this.data('url') @@ -3783,24 +3814,13 @@ function initVueDataset() { if(document.getElementById('dataset-file-desc')){ dataset_file_desc = document.getElementById('dataset-file-desc').value } - - // getEditInit(){ - // if($('#dataset-edit-value')){ - // $this = $('#dataset-edit-value') - // this.ruleForm.title = $this.data('edit-title') || '' - // this.ruleForm.description = $this.data('edit-description') || '' - // this.ruleForm.category = $this.data('edit-category') || '' - // this.ruleForm.task = $this.data('edit-task') || '' - // this.ruleForm.license = $this.data('edit-license') || '' - // this.ruleForm.id = $this.data('edit-id')|| '' - // } - // }, new Vue({ delimiters: ['${', '}'], el, data: { suburl: AppSubUrl, url:'', + checked:false, type:0, desc:'', descfile:'', @@ -3897,6 +3917,12 @@ function initVueDataset() { this.getCurrentRepoDataset(this.repolink,this.cloudbrainType) } + const params = new URLSearchParams(location.search) + if (params.has('recommend') && params.get('recommend')=='true'){ + this.checked = true + }else{ + this.checked = false + } }, created(){ if(document.getElementById('postPath')){ @@ -3937,6 +3963,30 @@ function initVueDataset() { } }, + handleCheckedChange(val){ + if(val){ + if(location.search){ + const params = new URLSearchParams(location.search) + if(params.has('recommend')){ + params.delete('recommend') + let search = params.toString() + location.href = `${AppSubUrl}/explore/datasets?${search}&recommend=${val}` + }else{ + location.href = `${AppSubUrl}/explore/datasets${location.search}&recommend=${val}` + } + }else{ + location.href = `${AppSubUrl}/explore/datasets?recommend=${val}` + } + }else{ + if(location.search=='?recommend=true'){ + location.href = AppSubUrl + location.pathname + }else{ + const params = new URLSearchParams(location.search) + params.delete('recommend') + location.href = AppSubUrl + location.pathname + '?' + params.toString() + } + } + }, createDataset(formName){ let _this = this this.$refs[formName].validate((valid)=>{ From 8d5b6b93d1fc41650226dbc4c58c7dbe474e03d9 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Sun, 24 Apr 2022 11:16:29 +0800 Subject: [PATCH 3/4] fix issue --- templates/admin/dataset/search.tmpl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/admin/dataset/search.tmpl b/templates/admin/dataset/search.tmpl index 749065401..6b42fb6cf 100644 --- a/templates/admin/dataset/search.tmpl +++ b/templates/admin/dataset/search.tmpl @@ -26,7 +26,4 @@
- - \ No newline at end of file + \ No newline at end of file From d2ad74638407c518f70693334277d4d9061a804f Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Sun, 24 Apr 2022 11:45:27 +0800 Subject: [PATCH 4/4] fix issue --- templates/admin/cloudbrain/imagecommit.tmpl | 5 ++--- web_src/js/components/images/adminImages.vue | 8 ++------ web_src/js/features/images.js | 3 ++- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/templates/admin/cloudbrain/imagecommit.tmpl b/templates/admin/cloudbrain/imagecommit.tmpl index e504f08b0..21ab73104 100644 --- a/templates/admin/cloudbrain/imagecommit.tmpl +++ b/templates/admin/cloudbrain/imagecommit.tmpl @@ -29,7 +29,7 @@

{{.i18n.Tr "repo.submit_image"}}

- +
@@ -125,5 +125,4 @@
-{{template "base/footer" .}} - \ No newline at end of file +{{template "base/footer" .}} \ No newline at end of file diff --git a/web_src/js/components/images/adminImages.vue b/web_src/js/components/images/adminImages.vue index 57d1c90eb..3b372114c 100644 --- a/web_src/js/components/images/adminImages.vue +++ b/web_src/js/components/images/adminImages.vue @@ -27,7 +27,7 @@
- 创建云脑镜像 + 创建云脑镜像
{{scope.row.numStars}}
- - - + 设为推荐复制地址
diff --git a/web_src/js/features/images.js b/web_src/js/features/images.js index a6631f69c..0cafb3901 100644 --- a/web_src/js/features/images.js +++ b/web_src/js/features/images.js @@ -165,12 +165,13 @@ export default async function initImage(){ return false }) $('#cancel_submit_image').click(()=>{ + console.log(pageform) if(link.includes('cloudbrain')){ let repoLink = link.split('cloudbrain')[0] location.href = `${window.config.AppSubUrl}${repoLink}debugjob?debugListType=all` }else if(pageform=='imageSquare'){ location.href = `${window.config.AppSubUrl}/explore/images?type=myimage` - }else if(pageform=='imageAdmin'){ + }else if(pageform){ location.href = `${window.config.AppSubUrl}/admin/images` } })