@@ -34,6 +34,11 @@ const (
34
34
35
35
// Account renders change user's password, user's email and user suicide page
36
36
func Account (ctx * context.Context ) {
37
+ if user_model .IsFeatureDisabledWithLoginType (ctx .Doer , setting .UserFeatureManageCredentials , setting .UserFeatureDeletion ) && ! setting .Service .EnableNotifyMail {
38
+ ctx .NotFound ("Not Found" , fmt .Errorf ("account setting are not allowed to be changed" ))
39
+ return
40
+ }
41
+
37
42
ctx .Data ["Title" ] = ctx .Tr ("settings.account" )
38
43
ctx .Data ["PageIsSettingsAccount" ] = true
39
44
ctx .Data ["Email" ] = ctx .Doer .Email
@@ -54,6 +59,8 @@ func AccountPost(ctx *context.Context) {
54
59
form := web .GetForm (ctx ).(* forms.ChangePasswordForm )
55
60
ctx .Data ["Title" ] = ctx .Tr ("settings" )
56
61
ctx .Data ["PageIsSettingsAccount" ] = true
62
+ ctx .Data ["Email" ] = ctx .Doer .Email
63
+ ctx .Data ["EnableNotifyMail" ] = setting .Service .EnableNotifyMail
57
64
58
65
if ctx .HasError () {
59
66
loadAccountData (ctx )
@@ -103,6 +110,8 @@ func EmailPost(ctx *context.Context) {
103
110
form := web .GetForm (ctx ).(* forms.AddEmailForm )
104
111
ctx .Data ["Title" ] = ctx .Tr ("settings" )
105
112
ctx .Data ["PageIsSettingsAccount" ] = true
113
+ ctx .Data ["Email" ] = ctx .Doer .Email
114
+ ctx .Data ["EnableNotifyMail" ] = setting .Service .EnableNotifyMail
106
115
107
116
// Make email address primary.
108
117
if ctx .FormString ("_method" ) == "PRIMARY" {
@@ -256,6 +265,8 @@ func DeleteAccount(ctx *context.Context) {
256
265
257
266
ctx .Data ["Title" ] = ctx .Tr ("settings" )
258
267
ctx .Data ["PageIsSettingsAccount" ] = true
268
+ ctx .Data ["Email" ] = ctx .Doer .Email
269
+ ctx .Data ["EnableNotifyMail" ] = setting .Service .EnableNotifyMail
259
270
260
271
if _ , _ , err := auth .UserSignIn (ctx , ctx .Doer .Name , ctx .FormString ("password" )); err != nil {
261
272
switch {
0 commit comments