diff --git a/models/error.go b/models/error.go index 503144ccb..90cc6aa00 100644 --- a/models/error.go +++ b/models/error.go @@ -454,7 +454,7 @@ func (err ErrTeamAlreadyHasAccess) Error() string { // ErrUserIsMemberOfTeam represents an error where a user is already member of a team. type ErrUserIsMemberOfTeam struct { TeamID int64 - UserID int64 + UserID int64 } // IsErrUserIsMemberOfTeam checks if an error is ErrUserIsMemberOfTeam. @@ -465,4 +465,4 @@ func IsErrUserIsMemberOfTeam(err error) bool { func (err ErrUserIsMemberOfTeam) Error() string { return fmt.Sprintf("This user is already a member of that team. [Team ID: %d, User ID: %d]", err.TeamID, err.UserID) -} \ No newline at end of file +} diff --git a/models/teams.go b/models/teams.go index 907318118..07bf0452e 100644 --- a/models/teams.go +++ b/models/teams.go @@ -37,10 +37,10 @@ func (t *Team) AfterLoad() { // TeamMember defines the relationship between a user and a team type TeamMember struct { - ID int64 `xorm:"int(11) autoincr not null unique pk" json:"id"` - TeamID int64 `xorm:"int(11) not null" json:"team_id" param:"team"` - UserID int64 `xorm:"int(11) not null" json:"user_id" param:"user"` - Admin bool `xorm:"tinyint(1)" json:"admin"` + ID int64 `xorm:"int(11) autoincr not null unique pk" json:"id"` + TeamID int64 `xorm:"int(11) not null" json:"team_id" param:"team"` + UserID int64 `xorm:"int(11) not null" json:"user_id" param:"user"` + Admin bool `xorm:"tinyint(1)" json:"admin"` Created int64 `xorm:"created" json:"created"` Updated int64 `xorm:"updated" json:"updated"` @@ -56,7 +56,7 @@ func (TeamMember) TableName() string { // TeamUser is the team member type type TeamUser struct { - User `xorm:"extends"` + User `xorm:"extends"` Admin bool `json:"admin"` }