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

remove left over function GetMemberCount, rename function SignOut to RemoveFrom

Browse Source
This commit is contained in:
viehlieb 2023-03-10 13:46:18 +01:00 committed by kolaente
parent bf87763b2f
commit 47801df974
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/models/team_members.go
View File

@ -115,15 +115,6 @@ func (tm *TeamMember) CheckMembership(s *xorm.Session) (exists bool, err error)
return exists, err
}
func (tm *TeamMember) GetMemberCount(s *xorm.Session) (memberCount int64, err error) {
member := TeamMember{}
memberCount, err = s.
Where("team_id = ?", tm.TeamID).
Cols("user_id").
Count(&member)
return memberCount, err
}
// Update toggles a team member's admin status
// @Summary Toggle a team member's admin status
// @Description If a user is team admin, this will make them member and vise-versa.

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

@ -216,7 +216,7 @@ func HandleCallback(c echo.Context) error {
if err != nil {
log.Errorf("Could not proceed with group routine %v", err)
}
errs = SignOutFromTeamsByID(s, u, utils.NotIn(oldOidcTeams, oidcTeams))
errs = RemoveUserFromTeamsByIds(s, u, utils.NotIn(oldOidcTeams, oidcTeams))
log.Errorf("%v", errs)
for _, err := range errs {
log.Errorf("Found Error while signing out from teams %v", err)
@ -281,7 +281,10 @@ func AssignOrCreateUserToTeams(s *xorm.Session, u *user.User, teamData []models.
}
return oidcTeams, err
}
<<<<<<< HEAD
=======
>>>>>>> 169b668c... remove left over function GetMemberCount, rename function SignOut to RemoveFrom
func RemoveUserFromTeamsByIds(s *xorm.Session, u *user.User, teamIDs []int64) (errs []error) {
errs = []error{}
for _, teamID := range teamIDs {
@ -340,11 +343,7 @@ func getTeamDataFromToken(groups []map[string]interface{}, provider *Provider) (
}
func CreateTeamWithData(s *xorm.Session, teamData models.OIDCTeamData, u *user.User) (team *models.Team, err error) {
<<<<<<< HEAD
team = &models.Team{
=======
tea := &models.Team{
>>>>>>> b607fea4... change too generic name TeamData struct to OIDCTeamData
Name: teamData.TeamName,
Description: teamData.Description,
OidcID: teamData.OidcID,