From 6bd08a0b6f068519e207934cf4086b4d09041bd9 Mon Sep 17 00:00:00 2001
From: Michael Li <alimy@gility.net>
Date: Tue, 21 Jan 2020 21:11:00 +0800
Subject: [PATCH] internal/db/org: fix private repositories are hidden in the
 organization view (#5890)

---
 go.mod             |  2 +-
 go.sum             |  2 --
 internal/db/org.go | 12 +++++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index b975da9ba..a97dc161c 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,6 @@ require (
 	github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659
 	github.com/go-macaron/toolbox v0.0.0-20190813233741-94defb8383c6
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/go-xorm/builder v0.3.4
 	github.com/gogs/chardet v0.0.0-20150115103509-2404f7772561
 	github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
 	github.com/gogs/git-module v0.8.3
@@ -64,6 +63,7 @@ require (
 	gopkg.in/ini.v1 v1.49.0
 	gopkg.in/ldap.v2 v2.5.1
 	gopkg.in/macaron.v1 v1.3.4
+	xorm.io/builder v0.3.6
 	xorm.io/core v0.7.2
 	xorm.io/xorm v0.8.0
 )
diff --git a/go.sum b/go.sum
index 9d2fcdb89..bc6c26347 100644
--- a/go.sum
+++ b/go.sum
@@ -70,8 +70,6 @@ github.com/go-macaron/toolbox v0.0.0-20190813233741-94defb8383c6/go.mod h1:YFNJ/
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-xorm/builder v0.3.4 h1:FxkeGB4Cggdw3tPwutLCpfjng2jugfkg6LDMrd/KsoY=
-github.com/go-xorm/builder v0.3.4/go.mod h1:KxkQkNN1DpPKTedxXyTQcmH+rXfvk4LZ9SOOBoZBAxw=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
diff --git a/internal/db/org.go b/internal/db/org.go
index fb16c830b..e07480bfc 100644
--- a/internal/db/org.go
+++ b/internal/db/org.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 	"xorm.io/xorm"
 )
 
@@ -511,8 +511,9 @@ func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repos
 	}
 	repos := make([]*Repository, 0, pageSize)
 	if err = x.Where("owner_id = ?", org.ID).
-		And("is_private = ?", false).
-		Or(builder.In("id", teamRepoIDs)).
+		And(builder.Or(
+			builder.Expr("is_private = ?", false),
+			builder.In("id", teamRepoIDs))).
 		Desc("updated_unix").
 		Limit(pageSize, (page-1)*pageSize).
 		Find(&repos); err != nil {
@@ -520,8 +521,9 @@ func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repos
 	}
 
 	repoCount, err := x.Where("owner_id = ?", org.ID).
-		And("is_private = ?", false).
-		Or(builder.In("id", teamRepoIDs)).
+		And(builder.Or(
+			builder.Expr("is_private = ?", false),
+			builder.In("id", teamRepoIDs))).
 		Count(new(Repository))
 	if err != nil {
 		return nil, 0, fmt.Errorf("count user repositories: %v", err)