diff --git a/models/cloudbrain_image.go b/models/cloudbrain_image.go old mode 100644 new mode 100755 index f72c6a27c..71f0c2c94 --- a/models/cloudbrain_image.go +++ b/models/cloudbrain_image.go @@ -68,6 +68,7 @@ type SearchImageOptions struct { IncludeCustom bool IncludeOwnerOnly bool Topics string + CloudbrainType int ListOptions SearchOrderBy } @@ -411,6 +412,10 @@ func SearchImageCondition(opts *SearchImageOptions) builder.Cond { } + if opts.CloudbrainType > 0 { + cond = cond.And(builder.Eq{"cloudbrain_type": opts.CloudbrainType}) + } + return cond } diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 0fa615fac..24a5df821 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1037,6 +1037,7 @@ func GetPublicImages(ctx *context.Context) { IncludeOfficialOnly: ctx.QueryBool("recommend"), SearchOrderBy: "type desc, num_stars desc,id desc", Status: models.IMAGE_STATUS_SUCCESS, + CloudbrainType: ctx.QueryInt("cloudbrainType"), } getImages(ctx, &opts) diff --git a/web_src/js/components/images/Images.vue b/web_src/js/components/images/Images.vue old mode 100644 new mode 100755 index 5c50f38d7..456bf27e9 --- a/web_src/js/components/images/Images.vue +++ b/web_src/js/components/images/Images.vue @@ -672,7 +672,7 @@ export default { }, filters:{ transformType(val){ - if(val==0){ + if(val==0 || val==2){ return "GPU" } }, diff --git a/web_src/js/components/images/selectGrampusImages.vue b/web_src/js/components/images/selectGrampusImages.vue index a83e2571b..3639602bb 100755 --- a/web_src/js/components/images/selectGrampusImages.vue +++ b/web_src/js/components/images/selectGrampusImages.vue @@ -84,7 +84,7 @@ currentPagePublic: 1, pageSizePublic: 5, totalNumPublic: 0, - paramsPublic: { page: 1, pageSize: 5, q: '', recommend: false }, + paramsPublic: { page: 1, pageSize: 5, q: '', recommend: false,cloudbrainType: 2 }, tableDataPublic: [], loadingPublic: false, diff --git a/web_src/js/features/images.js b/web_src/js/features/images.js index 3ecc2f193..4a88a29e0 100755 --- a/web_src/js/features/images.js +++ b/web_src/js/features/images.js @@ -218,7 +218,7 @@ export default async function initImage(){ new Vue({ el:el, - render: h => h(selectImages) + render: h => h(selectGrampusImages) }); } initVueImages()