Browse Source

improved dataset in repo page

tags/v1.21.12.1
yan 5 years ago
parent
commit
091e1ae047
3 changed files with 39 additions and 1 deletions
  1. +2
    -0
      models/dataset.go
  2. +1
    -0
      models/migrations/v140.go
  3. +36
    -1
      routers/repo/dataset.go

+ 2
- 0
models/dataset.go View File

@@ -26,6 +26,7 @@ type Dataset struct {
Task string
ReleaseID int64 `xorm:"INDEX"`
UserID int64 `xorm:"INDEX"`
RepoID int64 `xorm:"INDEX"`
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`

@@ -78,6 +79,7 @@ func (datasets DatasetList) loadAttributes(e Engine) error {
type SearchDatasetOptions struct {
Keyword string
OwnerID int64
RepoID int64
IncludePublic bool
ListOptions
SearchOrderBy


+ 1
- 0
models/migrations/v140.go View File

@@ -23,6 +23,7 @@ func addDatasetTable(x *xorm.Engine) error {
Task string
ReleaseID int64 `xorm:"INDEX"`
UserID int64 `xorm:"INDEX"`
RepoID int64 `xorm:"INDEX"`
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}


+ 36
- 1
routers/repo/dataset.go View File

@@ -6,6 +6,7 @@ import (
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
)

const (
@@ -13,10 +14,44 @@ const (
)

func DatasetIndex(ctx *context.Context) {
var orderBy models.SearchOrderBy
repo := ctx.Repo.Repository
user := ctx.User
page := ctx.QueryInt("page")
if page <= 0 {
page = 1
}
ctx.Data["SortType"] = ctx.Query("sort")
switch ctx.Query("sort") {
case "newest":
orderBy = models.SearchOrderByNewest
case "oldest":
orderBy = models.SearchOrderByOldest
case "recentupdate":
orderBy = models.SearchOrderByRecentUpdated
case "leastupdate":
orderBy = models.SearchOrderByLeastUpdated
case "reversealphabetically":
orderBy = models.SearchOrderByAlphabeticallyReverse
case "alphabetically":
orderBy = models.SearchOrderByAlphabetically
case "reversesize":
orderBy = models.SearchOrderBySizeReverse
default:
ctx.Data["SortType"] = "recentupdate"
orderBy = models.SearchOrderByRecentUpdated
}
ctx.Data["PageIsDataset"] = true
ctx.Data["Title"] = ctx.Tr("dataset.show_dataset")
ctx.Data["Link"] = ctx.Repo.RepoLink + "/datasets"
user := ctx.User
models.SearchDataset(&models.SearchDatasetOptions{
ListOptions: models.ListOptions{
Page: page,
PageSize: setting.UI.ExplorePagingNum,
},
SearchOrderBy: orderBy,
RepoID: repo.ID,
})
dataset, err := models.GetDatasetByID(5)
if err != nil {
ctx.NotFound("GetDataset", err)


Loading…
Cancel
Save