rewok checkMembership to not load user and improvements on return val
This commit is contained in:
parent
3b4c5e4815
commit
e0a1eae268
|
@ -110,18 +110,13 @@ func (tm *TeamMember) Delete(s *xorm.Session, a web.Auth) (err error) {
|
|||
}
|
||||
|
||||
func (tm *TeamMember) CheckMembership(s *xorm.Session) (exists bool, err error) {
|
||||
member, err := user2.GetUserByUsername(s, tm.Username)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
tm.UserID = member.ID
|
||||
exists, err = s.
|
||||
Where("team_id = ? AND user_id = ?", tm.TeamID, tm.UserID).
|
||||
Get(&TeamMember{})
|
||||
if exists {
|
||||
if exists && err == nil {
|
||||
return
|
||||
}
|
||||
return exists, ErrUserIsMemberOfTeam{tm.UserID, tm.UserID}
|
||||
return exists, err
|
||||
}
|
||||
|
||||
// Update toggles a team member's admin status
|
||||
|
|
Loading…
Reference in New Issue
Block a user