Skip to content

Fix template error on account page #8562

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

Merged
merged 5 commits into from
Oct 19, 2019
Merged

Fix template error on account page #8562

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e8c58d
Fix template error on account page
jolheiser Oct 17, 2019
7dfbcac
Merge branch 'master' into patch-2
lunny Oct 18, 2019
a92954f
Merge branch 'master' into patch-2
lafriks Oct 18, 2019
2c9a9a7
Merge branch 'master' into patch-2
jolheiser Oct 18, 2019
d5ef9f6
Merge branch 'master' into patch-2
jolheiser Oct 19, 2019
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 routers/user/setting/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ func Account(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsAccount"] = true
ctx.Data["Email"] = ctx.User.Email
ctx.Data["EmailNotificationsPreference"] = ctx.User.EmailNotifications()

loadAccountData(ctx)

Expand Down Expand Up @@ -230,4 +229,5 @@ func loadAccountData(ctx *context.Context) {
return
}
ctx.Data["Emails"] = emails
ctx.Data["EmailNotificationsPreference"] = ctx.User.EmailNotifications()
}