From bd285f2c52bf1aae90667a3279a36fa359d77150 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 29 Jun 2022 15:31:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/attachment.go | 2 +- models/dataset.go | 5 +++-- routers/repo/dataset.go | 6 ------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/models/attachment.go b/models/attachment.go index 9b0083aaa..913388670 100755 --- a/models/attachment.go +++ b/models/attachment.go @@ -583,7 +583,7 @@ func AttachmentsByDatasetOption(datasets []int64, opts *SearchDatasetOptions) ([ } if opts.UploadAttachmentByMe { cond = cond.And( - builder.Eq{"attachment.uploader_id": opts.OwnerID}, + builder.Eq{"attachment.uploader_id": opts.User.ID}, ) } diff --git a/models/dataset.go b/models/dataset.go index f2f4ef51e..806daec46 100755 --- a/models/dataset.go +++ b/models/dataset.go @@ -282,7 +282,7 @@ func generateFilterCond(opts *SearchDatasetOptions, cond builder.Cond) builder.C cond = cond.And(builder.Eq{"attachment.type": opts.CloudBrainType}) } if opts.UploadAttachmentByMe { - cond = cond.And(builder.Eq{"attachment.uploader_id": opts.OwnerID}) + cond = cond.And(builder.Eq{"attachment.uploader_id": opts.User.ID}) } return cond @@ -311,7 +311,8 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da sess.Select(selectColumnsSql).Join("INNER", "repository", "repository.id = dataset.repo_id"). Join("INNER", "attachment", "attachment.dataset_id=dataset.id"). Where(cond).OrderBy(opts.SearchOrderBy.String()) - + a, _ := sess.LastSQL() + log.Warn("dataset sql:" + a) if opts.PageSize > 0 { sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize) } diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 97d7a2060..4dde646a6 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -415,14 +415,8 @@ func datasetMultiple(ctx *context.Context, opts *models.SearchDatasetOptions) { cloudbrainType := ctx.QueryInt("type") keyword := strings.Trim(ctx.Query("q"), " ") orderBy := models.SearchOrderByRecentUpdated - var ownerID int64 - if ctx.User != nil { - ownerID = ctx.User.ID - } - opts.Keyword = keyword opts.SearchOrderBy = orderBy - opts.OwnerID = ownerID opts.RecommendOnly = ctx.QueryBool("recommend") opts.CloudBrainType = cloudbrainType opts.ListOptions = models.ListOptions{ From 3b70f26f696af680106f7baf36e9f012dea73b7d Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 29 Jun 2022 15:42:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/dataset.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/models/dataset.go b/models/dataset.go index 806daec46..9241b7bf9 100755 --- a/models/dataset.go +++ b/models/dataset.go @@ -249,6 +249,10 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond { subCon = generateFilterCond(opts, subCon) cond = cond.Or(subCon) } + } else { + if opts.StarByMe { + cond = cond.And(builder.Eq{"dataset.id": -1}) + } } return cond @@ -311,8 +315,6 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da sess.Select(selectColumnsSql).Join("INNER", "repository", "repository.id = dataset.repo_id"). Join("INNER", "attachment", "attachment.dataset_id=dataset.id"). Where(cond).OrderBy(opts.SearchOrderBy.String()) - a, _ := sess.LastSQL() - log.Warn("dataset sql:" + a) if opts.PageSize > 0 { sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize) } From 16693644e35eb192c8ac69f5e5f5db3c0fc54e19 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 29 Jun 2022 15:55:28 +0800 Subject: [PATCH 3/3] debug --- routers/repo/cloudbrain.go | 2 +- templates/repo/cloudbrain/trainjob/new.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 98e1e6577..87302a49e 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -2270,7 +2270,7 @@ func getTrainJobCommand(form auth.CreateCloudBrainForm, fileNames string) (strin } } - param += " --dataset_list=" + fileNames + param += " --dataset_list='" + fileNames + "'" command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + form.DisplayJobName + "-" + cloudbrain.LogFile diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index 0d6659384..51c7bb5b3 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -97,7 +97,7 @@ {{.i18n.Tr "cloudbrain.resource_cluster_openi"}} - + {{.i18n.Tr "cloudbrain.resource_cluster_c2net"}}(Beta)