From 69edf860b61e92830d6994a025e30a60b7144e05 Mon Sep 17 00:00:00 2001
From: palytoxin <sxty32@gmail.com>
Date: Mon, 29 Jun 2020 14:37:32 +0800
Subject: [PATCH] tidy go.mod, fix spelling mistakes, fix profile search
 dataset is empty

---
 models/dataset.go               | 21 ++++++++++-----------
 options/locale/locale_en-US.ini |  4 ++--
 routers/user/profile.go         |  2 +-
 vendor/modules.txt              |  4 ----
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/models/dataset.go b/models/dataset.go
index 24bd212a1..7e72d3e56 100644
--- a/models/dataset.go
+++ b/models/dataset.go
@@ -126,25 +126,23 @@ func SearchDataset(opts *SearchDatasetOptions) (DatasetList, int64, error) {
 
 func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
 	var cond = builder.NewCond()
-	cond = cond.And(builder.Neq{"status": DatasetStatusDeleted})
+	cond = cond.And(builder.Neq{"dataset.status": DatasetStatusDeleted})
 
 	if len(opts.Keyword) > 0 {
-		cond = cond.And(builder.Like{"title", opts.Keyword})
+		cond = cond.And(builder.Like{"dataset.title", opts.Keyword})
 	}
 
 	if opts.RepoID > 0 {
-		cond = cond.And(builder.Eq{"repo_id": opts.RepoID})
+		cond = cond.And(builder.Eq{"dataset.repo_id": opts.RepoID})
 	}
 
 	if opts.IncludePublic {
-		cond = cond.And(builder.Eq{"status": DatasetStatusPublic})
+		cond = cond.And(builder.Eq{"dataset.status": DatasetStatusPublic})
 		if opts.OwnerID > 0 {
-			cond = cond.Or(builder.Eq{"user_id": opts.OwnerID})
-		}
-	} else {
-		if opts.OwnerID > 0 {
-			cond = cond.And(builder.Eq{"user_id": opts.OwnerID})
+			cond = cond.Or(builder.Eq{"repository.owner_id": opts.OwnerID})
 		}
+	} else if opts.OwnerID > 0 {
+		cond = cond.And(builder.Eq{"repository.owner_id": opts.OwnerID})
 	}
 
 	return cond
@@ -161,12 +159,13 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da
 
 	datasets := make(DatasetList, 0, opts.PageSize)
 
-	count, err := sess.Where(cond).Count(new(Dataset))
+	count, err := sess.Join("INNER", "repository", "repository.id = dataset.repo_id").Where(cond).Count(new(Dataset))
+
 	if err != nil {
 		return nil, 0, fmt.Errorf("Count: %v", err)
 	}
 
-	sess.Where(cond).OrderBy(opts.SearchOrderBy.String())
+	sess.Select("dataset.*").Join("INNER", "repository", "repository.id = dataset.repo_id").Where(cond).OrderBy(opts.SearchOrderBy.String())
 	if opts.PageSize > 0 {
 		sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
 	}
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index fe913ecf7..db2c35dfb 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -695,10 +695,10 @@ category.natural_language_processing= natural language processing
 category.speech_processing= speech processing
 category.computer_vision_natural_language_processing= computer vision and natural language processing
 attachment.delete= delete this version of dataset
-attachment.delete_desc= Are you sure you will delete this version of dataset, once deelted can not be recovery
+attachment.delete_desc= Are you sure you will delete this version of dataset, once deleted can not be recovery
 public= public
 private= private
-delete= deelte
+delete= delete
 
 [repo]
 owner = Owner
diff --git a/routers/user/profile.go b/routers/user/profile.go
index dc1d0a113..0e29b6117 100644
--- a/routers/user/profile.go
+++ b/routers/user/profile.go
@@ -229,7 +229,7 @@ func Profile(ctx *context.Context) {
 			ctx.ServerError("SearchDatasets", err)
 		}
 		total = int(count)
-		ctx.Data["datasets"] = datasets
+		ctx.Data["Datasets"] = datasets
 	default:
 		repos, count, err = models.SearchRepository(&models.SearchRepoOptions{
 			ListOptions: models.ListOptions{
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1517ca2f0..bd8131df5 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -607,8 +607,6 @@ github.com/spf13/jwalterweatherman
 github.com/spf13/pflag
 # github.com/spf13/viper v1.4.0
 github.com/spf13/viper
-# github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518
-## explicit
 # github.com/steveyen/gtreap v0.1.0
 github.com/steveyen/gtreap
 # github.com/stretchr/testify v1.4.0
@@ -640,8 +638,6 @@ github.com/toqueteos/webbrowser
 # github.com/tstranex/u2f v1.0.0
 ## explicit
 github.com/tstranex/u2f
-# github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8
-## explicit
 # github.com/unknwon/cae v1.0.0
 ## explicit
 github.com/unknwon/cae