Browse Source

update

tags/v1.22.6.1^2
liuzx 3 years ago
parent
commit
0a47ae4d8c
2 changed files with 19 additions and 18 deletions
  1. +10
    -10
      models/attachment.go
  2. +9
    -8
      routers/repo/dataset.go

+ 10
- 10
models/attachment.go View File

@@ -723,18 +723,18 @@ func MyFvAttachments(opts *AttachmentsOptions) ([]*AttachmentInfo, int64, error)
return nil, 0, fmt.Errorf("Count: %v", err)
}

if opts.Page >= 0 && opts.PageSize > 0 {
var start int
if opts.Page == 0 {
start = 0
} else {
start = (opts.Page - 1) * opts.PageSize
}
sess.Limit(opts.PageSize, start)
}
// if opts.Page >= 0 && opts.PageSize > 0 {
// var start int
// if opts.Page == 0 {
// start = 0
// } else {
// start = (opts.Page - 1) * opts.PageSize
// }
// sess.Limit(opts.PageSize, start)
// }

sess.OrderBy("attachment.created_unix DESC")
attachments := make([]*AttachmentInfo, 0, setting.UI.DatasetPagingNum)
attachments := make([]*AttachmentInfo, 0)
if err := sess.Table(&Attachment{}).Where(cond).
Find(&attachments); err != nil {
return nil, 0, fmt.Errorf("Find: %v", err)


+ 9
- 8
routers/repo/dataset.go View File

@@ -487,10 +487,6 @@ func MyFavoriteDataset(ctx *context.Context) {
}

NotColDatasets, NotColcount, err := models.MyFvAttachments(&models.AttachmentsOptions{
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.DatasetPagingNum,
},
Keyword: keyword,
NeedDatasetIDs: true,
DatasetIDs: NotColDatasetIDs,
@@ -508,10 +504,6 @@ func MyFavoriteDataset(ctx *context.Context) {
}
//If is collaborator, there is no need to determine whether the dataset is private or public
IsColDatasets, IsColcount, err := models.MyFvAttachments(&models.AttachmentsOptions{
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.DatasetPagingNum,
},
Keyword: keyword,
NeedDatasetIDs: true,
DatasetIDs: NotColDatasetIDs,
@@ -562,6 +554,15 @@ func merge(a, b interface{}) interface{} {

return a
}
func getTotalPage(total int64, pageSize int) int {

another := 0
if int(total)%pageSize != 0 {
another = 1
}
return int(total)/pageSize + another

}

func GetDatasetStatus(ctx *context.Context) {



Loading…
Cancel
Save