models/dataset.go

@@ -236,31 +236,6 @@ func SearchMyDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
 
 	cond = generateBasicFilterCond(opts, cond)
 
-	if opts.RepoID > 0 {
-		cond = cond.And(builder.Eq{"dataset.repo_id": opts.RepoID})
-	}
-
-	if opts.ExcludeDatasetId > 0 {
-		cond = cond.And(builder.Neq{"dataset.id": opts.ExcludeDatasetId})
-	}
-
-	if opts.PublicOnly {
-		cond = cond.And(builder.Eq{"dataset.status": DatasetStatusPublic})
-	} else if opts.IncludePublic {
-		cond = cond.And(builder.Eq{"dataset.status": DatasetStatusPublic})
-		if opts.OwnerID > 0 {
-			subCon := builder.NewCond()
-			subCon = subCon.And(builder.Eq{"repository.owner_id": opts.OwnerID})
-			subCon = generateBasicFilterCond(opts, subCon)
-			cond = cond.Or(subCon)
-
-		}
-	} else if opts.OwnerID > 0 && !opts.StarByMe && !opts.UploadAttachmentByMe {
-		cond = cond.And(builder.Eq{"repository.owner_id": opts.OwnerID})
-		if !opts.IsOwner {
-			cond = cond.And(builder.Eq{"dataset.status": DatasetStatusPublic})
-		}
-	}
 	if len(opts.DatasetIDs) > 0 && opts.UploadAttachmentByMe {
 		cond = cond.And(builder.In("dataset.id", opts.DatasetIDs))
 	}
@@ -697,7 +672,7 @@ func GetCollaboratorDatasetIdsByUserID(userID int64) []int64 {
 
 func GetOwnedDatasetIdsByUserID(userID int64) []int64 {
 	var datasets []int64
-	_ = x.Table("dataset").Join("INNER", "repository", "dataset.repo_id = repository.id  and repository.owner_id=?", userID).
+	_ = x.Table("dataset").Join("INNER", "repository", "((dataset.repo_id = repository.id  and repository.owner_id=?) or dataset.user_id=? )", userID, userID).
 		Cols("dataset.id").Find(&datasets)
 	return datasets
 }