vikunja/vikunja
7
43
Fork 73
Code Issues 149 Pull Requests 17 Packages Releases 32 Activity

rewok checkMembership to not load user and improvements on return val

Browse Source
This commit is contained in:
viehlieb 2023-02-13 17:05:34 +01:00
parent 445427febd
commit 6a90369818
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/models/team_members.go
View File

@ -110,18 +110,13 @@ func (tm *TeamMember) Delete(s *xorm.Session, _ web.Auth) (err error) {
} }
func (tm *TeamMember) CheckMembership(s *xorm.Session) (exists bool, 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. exists, err = s.
Where("team_id = ? AND user_id = ?", tm.TeamID, tm.UserID). Where("team_id = ? AND user_id = ?", tm.TeamID, tm.UserID).
Get(&TeamMember{}) Get(&TeamMember{})
if exists { if exists && err == nil {
return return
} }
return exists, ErrUserIsMemberOfTeam{tm.UserID, tm.UserID} return exists, err
} }
// Update toggles a team member's admin status // Update toggles a team member's admin status