Browse Source

解决bug

tags/v1.22.3.2^2
yanchao 4 years ago
parent
commit
47ec57ae79
2 changed files with 1 additions and 6 deletions
  1. +1
    -4
      models/dataset.go
  2. +0
    -2
      routers/home.go

+ 1
- 4
models/dataset.go View File

@@ -1,12 +1,10 @@
package models

import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
"errors"
"fmt"
"sort"
"strconv"
"xorm.io/builder"
)

@@ -195,7 +193,7 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da
datasets := make(DatasetList, 0, opts.PageSize)
selectColumnsSql := "distinct dataset.id,dataset.title, dataset.status, dataset.category, dataset.description, dataset.download_times, dataset.license, dataset.task, dataset.release_id, dataset.user_id, dataset.repo_id, dataset.created_unix,dataset.updated_unix,dataset.num_stars"

count, err := sess.Select("distinct dataset.id").Join("INNER", "repository", "repository.id = dataset.repo_id").
count, err := sess.Distinct("dataset.id").Join("INNER", "repository", "repository.id = dataset.repo_id").
Join("INNER", "attachment", "attachment.dataset_id=dataset.id").
Where(cond).Count(new(Dataset))

@@ -217,7 +215,6 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da
if err = datasets.loadAttributes(sess); err != nil {
return nil, 0, fmt.Errorf("LoadAttributes: %v", err)
}
log.Warn("datasetcout:" + strconv.FormatInt(count, 10))

return datasets, count, nil
}


+ 0
- 2
routers/home.go View File

@@ -8,7 +8,6 @@ package routers
import (
"bytes"
"net/http"
"strconv"
"strings"

"code.gitea.io/gitea/services/repository"
@@ -337,7 +336,6 @@ func ExploreDatasets(ctx *context.Context) {

datasets, count, err = models.SearchDataset(opts)

log.Warn("datasetcout:" + strconv.FormatInt(count, 10))
if err != nil {
ctx.ServerError("SearchDatasets", err)
return


Loading…
Cancel
Save