From 77e8800abe8dce6bbb03496caf8fc30ea1322a2f Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 16 Jun 2022 14:44:26 +0800 Subject: [PATCH 1/4] fix-2208 --- routers/repo/dataset.go | 73 +++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 3bc7cb97c..0797aa5bb 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -468,20 +468,19 @@ func MyFavoriteDataset(ctx *context.Context) { }) return } + //If the dataset has been deleted, it will not be counted for _, datasetStar := range datasetStars { - DatasetIsCollaborator := DatasetIsCollaborator(ctx, datasetStar.DatasetID) - dataset, err := models.GetDatasetByID(datasetStar.DatasetID) + IsExist, repo, dataset, err := IsDatasetStarExist(datasetStar) if err != nil { - return + log.Error("IsDatasetStarExist error:", err.Error()) } - repo, err := models.GetRepositoryByID(dataset.RepoID) - if err != nil { - return - } - if repo.OwnerID == ctx.User.ID || DatasetIsCollaborator { - IsColDatasetIDs = append(IsColDatasetIDs, datasetStar.DatasetID) - } else { - NotColDatasetIDs = append(NotColDatasetIDs, datasetStar.DatasetID) + if IsExist { + DatasetIsCollaborator := DatasetIsCollaborator(ctx, dataset) + if repo.OwnerID == ctx.User.ID || DatasetIsCollaborator { + IsColDatasetIDs = append(IsColDatasetIDs, datasetStar.DatasetID) + } else { + NotColDatasetIDs = append(NotColDatasetIDs, datasetStar.DatasetID) + } } } @@ -609,35 +608,45 @@ func GetDatasetStatus(ctx *context.Context) { "AttachmentStatus": fmt.Sprint(attachment.DecompressState), }) } -func DatasetIsCollaborator(ctx *context.Context, DatasetID int64) bool { - dataset, err := models.GetDatasetByID(DatasetID) +func DatasetIsCollaborator(ctx *context.Context, dataset *models.Dataset) bool { + repo, err := models.GetRepositoryByID(dataset.RepoID) if err != nil { - log.Error("query dataset error:", err.Error()) - return false + log.Error("query repo error:", err.Error()) } else { - repo, err := models.GetRepositoryByID(dataset.RepoID) - if err != nil { - log.Error("query repo error:", err.Error()) - } else { - repo.GetOwner() - if ctx.User != nil { - if repo.Owner.IsOrganization() { - if repo.Owner.IsUserPartOfOrg(ctx.User.ID) { - for _, t := range repo.Owner.Teams { - if t.IsMember(ctx.User.ID) && t.HasRepository(repo.ID) { - return true - } + repo.GetOwner() + if ctx.User != nil { + if repo.Owner.IsOrganization() { + if repo.Owner.IsUserPartOfOrg(ctx.User.ID) { + for _, t := range repo.Owner.Teams { + if t.IsMember(ctx.User.ID) && t.HasRepository(repo.ID) { + return true } - return false } + return false } + } - isCollaborator, _ := repo.IsCollaborator(ctx.User.ID) - if isCollaborator { - return true - } + isCollaborator, _ := repo.IsCollaborator(ctx.User.ID) + if isCollaborator { + return true } } } + return false } +func IsDatasetStarExist(datasetStar *models.DatasetStar) (bool, *models.Repository, *models.Dataset, error) { + dataset, err := models.GetDatasetByID(datasetStar.DatasetID) + if err != nil { + log.Error("query dataset error:", err.Error()) + return false, nil, nil, err + } else { + repo, err := models.GetRepositoryByID(dataset.RepoID) + if err != nil { + log.Error("GetRepositoryByID error:", err.Error()) + return false, nil, nil, err + } + return true, repo, dataset, nil + } + +} From 25d99be2fc4deb155eadb9a5f0f9ca54ddc5b6f5 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 16 Jun 2022 15:46:17 +0800 Subject: [PATCH 2/4] fix-2208 --- routers/repo/dataset.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go index 0797aa5bb..133262bf3 100755 --- a/routers/repo/dataset.go +++ b/routers/repo/dataset.go @@ -622,6 +622,10 @@ func DatasetIsCollaborator(ctx *context.Context, dataset *models.Dataset) bool { return true } } + isOwner, _ := models.IsOrganizationOwner(repo.OwnerID, ctx.User.ID) + if isOwner { + return isOwner + } return false } } From e5cc326249010f0a332374e26a315777dcda827a Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 16 Jun 2022 16:14:58 +0800 Subject: [PATCH 3/4] fix 2304 --- routers/repo/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 44476ab1e..12a5a0623 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -1407,7 +1407,7 @@ func readDir(dirname string) ([]os.FileInfo, error) { return nil, err } - list, err := f.Readdir(100) + list, err := f.Readdir(0) f.Close() if err != nil { //todo: can not upload empty folder From 8588c5704304753986db29485ea2f80c1597e78c Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 16 Jun 2022 17:34:39 +0800 Subject: [PATCH 4/4] fix issue --- templates/repo/modelmanage/index.tmpl | 371 +++++++++++++++++----------------- 1 file changed, 190 insertions(+), 181 deletions(-) diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl index 2197dc1a3..3a1781064 100644 --- a/templates/repo/modelmanage/index.tmpl +++ b/templates/repo/modelmanage/index.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}} {{if eq $.MODEL_COUNT 0}}
-
-
未创建过模型
-
- {{if $.RepoIsEmpty}} -
代码版本:您还没有初始化代码仓库,请先创建代码版本;
- {{end}} - {{if eq $.TRAIN_COUNT 0}} -
训练任务:您还没创建过训练任务,请先创建训练任务
- {{end}} -
使用说明:可以参考启智AI协作平台小白训练营课程。
+
+
未创建过模型
+
+ {{if $.RepoIsEmpty}} +
代码版本:您还没有初始化代码仓库,请先创建代码版本;
+ {{end}} + {{if eq $.TRAIN_COUNT 0}} +
训练任务:您还没创建过训练任务,请先创建训练任务
+ {{end}} +
使用说明:可以参考启智AI协作平台小白训练营课程。
-
-
-
-
+
+
+
+
{{else}} @@ -129,212 +132,218 @@
- +
- +
- +
- +
- +
-
- +
- + -{{template "base/footer" .}} + {{template "base/footer" .}} - - + \ No newline at end of file