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..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
@@ -282,7 +286,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 +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())
-
if opts.PageSize > 0 {
sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
}
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/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{
diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl
index d1806cda0..f4ffc17b0 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)