vikunja
/
vikunja
6
43
Fork 71
Code Issues 150 Pull Requests 17 Packages Releases 32 Activity

chore: refactor
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
kolaente 2023-12-01 15:55:56 +01:00
parent 0f3a4f52ad
commit c522842d0c
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/models/team_members.go
View File

@ -108,11 +108,10 @@ func (tm *TeamMember) Delete(s *xorm.Session, _ web.Auth) (err error) {
return
}
func (tm *TeamMember) CheckMembership(s *xorm.Session) (exists bool, err error) {
exists, err = s.
func (tm *TeamMember) MembershipExists(s *xorm.Session) (exists bool, err error) {
return s.
Where("team_id = ? AND user_id = ?", tm.TeamID, tm.UserID).
Exist(&TeamMember{})
return exists, err
}
// Update toggles a team member's admin status

2
pkg/modules/auth/openid/openid.go
View File

@ -251,7 +251,7 @@ func AssignOrCreateUserToTeams(s *xorm.Session, u *user.User, teamData []models.
}
for _, team := range teams {
tm := models.TeamMember{TeamID: team.ID, UserID: u.ID, Username: u.Username}
exists, _ := tm.CheckMembership(s)
exists, _ := tm.MembershipExists(s)
if !exists {
err = tm.Create(s, u)
if err != nil {