Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip AllowedUserVisibilityModes validation on update user if it is an organisation #16988

Merged
merged 4 commits into from
Sep 8, 2021
Merged

Skip AllowedUserVisibilityModes validation on update user if it is an organisation #16988

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d6c658
fix
6543 Sep 8, 2021
b80b2bd
Merge branch 'main' into fix-500-if-ALLOWED_USER_VISIBILITY_MODES-is-…
6543 Sep 8, 2021
ae961da
Update models/user.go
6543 Sep 8, 2021
643f1b1
Merge branch 'main' into fix-500-if-ALLOWED_USER_VISIBILITY_MODES-is-…
6543 Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@ func checkDupEmail(e Engine, u *User) error {

// validateUser check if user is valide to insert / update into database
6543 marked this conversation as resolved.
Show resolved Hide resolved
6543 marked this conversation as resolved.
Show resolved Hide resolved
func validateUser(u *User) error {
if !setting.Service.AllowedUserVisibilityModesSlice.IsAllowedVisibility(u.Visibility) {
if !setting.Service.AllowedUserVisibilityModesSlice.IsAllowedVisibility(u.Visibility) && !u.IsOrganization() {
return fmt.Errorf("visibility Mode not allowed: %s", u.Visibility.String())
}

Expand Down