domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Merge password and 2fa page on user settings (#2695)

Browse source 
* merge password and 2fa page on user settings
This commit is contained in:
Lunny Xiao 2017-10-16 17:14:12 +08:00 • committed by Kim "BKC" Carlbäcker
parent c1b0c9e7c4
commit 9e865cee67
7 changed files with 117 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

7
routers/routes/routes.go
View file

@ -220,8 +220,8 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Combo("/email").Get(user.SettingsEmails).
Post(bindIgnErr(auth.AddEmailForm{}), user.SettingsEmailPost)
m.Post("/email/delete", user.DeleteEmail)
m.Get("/password", user.SettingsPassword)
m.Post("/password", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsPasswordPost)
m.Get("/security", user.SettingsSecurity)
m.Post("/security", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsSecurityPost)
m.Group("/openid", func() {
m.Combo("").Get(user.SettingsOpenID).
Post(bindIgnErr(auth.AddOpenIDForm{}), user.SettingsOpenIDPost)
@ -238,8 +238,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Combo("/account_link").Get(user.SettingsAccountLinks).Post(user.SettingsDeleteAccountLink)
m.Get("/organization", user.SettingsOrganization)
m.Get("/repos", user.SettingsRepos)
m.Group("/two_factor", func() {
m.Get("", user.SettingsTwoFactor)
m.Group("/security/two_factor", func() {
m.Post("/regenerate_scratch", user.SettingsTwoFactorRegenerateScratch)
m.Post("/disable", user.SettingsTwoFactorDisable)
m.Get("/enroll", user.SettingsTwoFactorEnroll)