Browse Source

Merge pull request '修复#687bug' (#1041) from fix-687 into V20211213

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1041
Reviewed-by: lewis <747342561@qq.com>
pull/1047/head
lewis 3 years ago
parent
commit
f1a700b36a
4 changed files with 12 additions and 3 deletions
  1. +4
    -0
      models/dataset.go
  2. +1
    -1
      models/user.go
  3. +2
    -2
      options/locale/locale_zh-CN.ini
  4. +5
    -0
      routers/user/profile.go

+ 4
- 0
models/dataset.go View File

@@ -93,6 +93,7 @@ type SearchDatasetOptions struct {
IncludePublic bool
ListOptions
SearchOrderBy
IsOwner bool
}

func CreateDataset(dataset *Dataset) (err error) {
@@ -150,6 +151,9 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
}
} else if opts.OwnerID > 0 {
cond = cond.And(builder.Eq{"repository.owner_id": opts.OwnerID})
if !opts.IsOwner {
cond = cond.And(builder.Eq{"dataset.status": DatasetStatusPublic})
}
}

return cond


+ 1
- 1
models/user.go View File

@@ -929,7 +929,7 @@ var (
"template",
"user",
"vendor",
"dashbord",
"dashboard",
"operation",
"blockchain",
"avatar",


+ 2
- 2
options/locale/locale_zh-CN.ini View File

@@ -857,7 +857,7 @@ modelarts.train_job.description=任务描述
modelarts.train_job.parameter_setting=参数设置
modelarts.train_job.parameter_setting_info=参数信息
modelarts.train_job.fast_parameter_setting=一键式参数配置
modelarts.train_job.fast_parameter_setting_config=如您已保存过参数配置,可单击
modelarts.train_job.fast_parameter_setting_config=如您已保存过参数配置,可单击
modelarts.train_job.fast_parameter_setting_config_link=这里
modelarts.train_job.frames=常用框架
modelarts.train_job.algorithm_origin=算法来源
@@ -1987,7 +1987,7 @@ team_unit_desc=允许访问项目单元
team_unit_disabled=(已禁用)

form.name_reserved=组织名称 '%s' 是被保留的。
form.name_pattern_not_allowed=项目名称中不允许使用 "%s"。
form.name_pattern_not_allowed=组织名称中不允许使用 "%s"。
form.create_org_not_allowed=此账号禁止创建组织

settings=组织设置


+ 5
- 0
routers/user/profile.go View File

@@ -210,10 +210,15 @@ func Profile(ctx *context.Context) {

total = int(count)
case "datasets":
var isOwner = false
if ctx.User != nil && ctx.User.ID == ctxUser.ID {
isOwner = true
}
datasetSearchOptions := &models.SearchDatasetOptions{
Keyword: keyword,
OwnerID: ctxUser.ID,
SearchOrderBy: orderBy,
IsOwner: isOwner,
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.ExplorePagingNum,


Loading…
Cancel
Save