Browse Source

fix-bug

tags/v1.22.3.2^2
liuzx 3 years ago
parent
commit
26badc5a3a
3 changed files with 14 additions and 12 deletions
  1. +5
    -5
      models/attachment.go
  2. +5
    -3
      modules/setting/setting.go
  3. +4
    -4
      routers/repo/dataset.go

+ 5
- 5
models/attachment.go View File

@@ -59,9 +59,9 @@ type AttachmentUsername struct {
}

type AttachmentInfo struct {
Attachment `xorm:"extends"`
Repo *Repository `xorm:"extends"`
User *User `xorm:"extends"`
Attachment `xorm:"extends"`
Repo *Repository `xorm:"extends"`
RelAvatarLink string `xorm:"extends"`
}

type AttachmentsOptions struct {
@@ -595,7 +595,7 @@ func Attachments(opts *AttachmentsOptions) ([]*AttachmentInfo, int64, error) {
}

sess.OrderBy("attachment.created_unix DESC")
attachments := make([]*AttachmentInfo, 0, setting.UI.IssuePagingNum)
attachments := make([]*AttachmentInfo, 0, setting.UI.DatasetPagingNum)
if err := sess.Table(&Attachment{}).Where(cond).
Find(&attachments); err != nil {
return nil, 0, fmt.Errorf("Find: %v", err)
@@ -615,7 +615,7 @@ func Attachments(opts *AttachmentsOptions) ([]*AttachmentInfo, int64, error) {
}
user, err := GetUserByID(attachment.UploaderID)
if err == nil {
attachment.User = user
attachment.RelAvatarLink = user.RelAvatarLink()
} else {
return nil, 0, fmt.Errorf("GetUserByID failed error: %v", err)
}


+ 5
- 3
modules/setting/setting.go View File

@@ -165,6 +165,7 @@ var (
ExplorePagingNum int
ContributorPagingNum int
IssuePagingNum int
DatasetPagingNum int
RepoSearchPagingNum int
MembersPagingNum int
FeedMaxCommitNum int
@@ -207,6 +208,7 @@ var (
ExplorePagingNum: 20,
ContributorPagingNum: 50,
IssuePagingNum: 10,
DatasetPagingNum: 5,
RepoSearchPagingNum: 10,
MembersPagingNum: 20,
FeedMaxCommitNum: 5,
@@ -512,9 +514,9 @@ var (
ProfileID string
PoolInfos string
Flavor string
DebugHost string
ImageInfos string
Capacity int
DebugHost string
ImageInfos string
Capacity int
//train-job
ResourcePools string
Engines string


+ 4
- 4
routers/repo/dataset.go View File

@@ -317,7 +317,7 @@ func CurrentRepoDataset(ctx *context.Context) {
datasets, count, err := models.Attachments(&models.AttachmentsOptions{
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.IssuePagingNum,
PageSize: setting.UI.DatasetPagingNum,
},
Keyword: keyword,
NeedDatasetIDs: true,
@@ -358,7 +358,7 @@ func MyDatasets(ctx *context.Context) {
datasets, count, err := models.Attachments(&models.AttachmentsOptions{
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.IssuePagingNum,
PageSize: setting.UI.DatasetPagingNum,
},
Keyword: keyword,
NeedDatasetIDs: false,
@@ -397,7 +397,7 @@ func PublicDataset(ctx *context.Context) {
datasets, count, err := models.Attachments(&models.AttachmentsOptions{
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.IssuePagingNum,
PageSize: setting.UI.DatasetPagingNum,
},
Keyword: keyword,
NeedDatasetIDs: false,
@@ -451,7 +451,7 @@ func MyFavoriteDataset(ctx *context.Context) {
datasets, count, err := models.Attachments(&models.AttachmentsOptions{
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.IssuePagingNum,
PageSize: setting.UI.DatasetPagingNum,
},
Keyword: keyword,
NeedDatasetIDs: true,


Loading…
Cancel
Save