From 34b92cdb440e175884b45df7197a65b086ff0eac Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Tue, 20 Dec 2016 23:23:57 -0500
Subject: Fix #3905

---
 models/models.go   |  1 +
 models/org.go      |  2 +-
 models/org_team.go | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'models')

diff --git a/models/models.go b/models/models.go
index 0cf422a9..19c4c29e 100644
--- a/models/models.go
+++ b/models/models.go
@@ -34,6 +34,7 @@ type Engine interface {
 	InsertOne(interface{}) (int64, error)
 	Iterate(interface{}, xorm.IterFunc) error
 	Sql(string, ...interface{}) *xorm.Session
+	Table(interface{}) *xorm.Session
 	Where(interface{}, ...interface{}) *xorm.Session
 }
 
diff --git a/models/org.go b/models/org.go
index 706b1889..ce6745bd 100644
--- a/models/org.go
+++ b/models/org.go
@@ -149,7 +149,7 @@ func CreateOrganization(org, owner *User) (err error) {
 	}
 
 	if _, err = sess.Insert(&TeamUser{
-		Uid:    owner.ID,
+		UID:    owner.ID,
 		OrgID:  org.ID,
 		TeamID: t.ID,
 	}); err != nil {
diff --git a/models/org_team.go b/models/org_team.go
index 6a6754cc..4c285b78 100644
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -369,7 +369,7 @@ type TeamUser struct {
 	ID     int64 `xorm:"pk autoincr"`
 	OrgID  int64 `xorm:"INDEX"`
 	TeamID int64 `xorm:"UNIQUE(s)"`
-	Uid    int64 `xorm:"UNIQUE(s)"`
+	UID    int64 `xorm:"UNIQUE(s)"`
 }
 
 func isTeamMember(e Engine, orgID, teamID, uid int64) bool {
@@ -390,8 +390,8 @@ func getTeamMembers(e Engine, teamID int64) (_ []*User, err error) {
 	members := make([]*User, 0, len(teamUsers))
 	for i := range teamUsers {
 		member := new(User)
-		if _, err = e.Id(teamUsers[i].Uid).Get(member); err != nil {
-			return nil, fmt.Errorf("get user '%d': %v", teamUsers[i].Uid, err)
+		if _, err = e.Id(teamUsers[i].UID).Get(member); err != nil {
+			return nil, fmt.Errorf("get user '%d': %v", teamUsers[i].UID, err)
 		}
 		members = append(members, member)
 	}
@@ -457,7 +457,7 @@ func AddTeamMember(orgID, teamID, uid int64) error {
 	}
 
 	tu := &TeamUser{
-		Uid:    uid,
+		UID:    uid,
 		OrgID:  orgID,
 		TeamID: teamID,
 	}
@@ -519,7 +519,7 @@ func removeTeamMember(e Engine, orgID, teamID, uid int64) error {
 	}
 
 	tu := &TeamUser{
-		Uid:    uid,
+		UID:    uid,
 		OrgID:  orgID,
 		TeamID: teamID,
 	}
-- 
cgit v1.2.3