File tree 2 files changed +1
-7
lines changed
2 files changed +1
-7
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ import (
10
10
"crypto/sha256"
11
11
"crypto/subtle"
12
12
"encoding/hex"
13
- "errors"
14
13
"fmt"
15
14
"net/url"
16
15
"os"
@@ -73,11 +72,6 @@ const (
73
72
EmailNotificationsDisabled = "disabled"
74
73
)
75
74
76
- var (
77
- // ErrUserNameIllegal user name contains illegal characters error
78
- ErrUserNameIllegal = errors .New ("User name contains illegal characters" )
79
- )
80
-
81
75
// User represents the object of individual and member of organization.
82
76
type User struct {
83
77
ID int64 `xorm:"pk autoincr"`
Original file line number Diff line number Diff line change @@ -73,7 +73,7 @@ func SettingsPost(ctx *context.Context) {
73
73
ctx .RenderWithErr (ctx .Tr ("form.username_been_taken" ), tplSettingsOptions , & form )
74
74
return
75
75
} else if err = user_model .ChangeUserName (org .AsUser (), form .Name ); err != nil {
76
- if err == user_model . ErrUserNameIllegal {
76
+ if db . IsErrNameReserved ( err ) || db . IsErrNamePatternNotAllowed ( err ) {
77
77
ctx .Data ["OrgName" ] = true
78
78
ctx .RenderWithErr (ctx .Tr ("form.illegal_username" ), tplSettingsOptions , & form )
79
79
} else {
You can’t perform that action at this time.
0 commit comments