Fix

Author: CaiCandong

routers/web/admin/users.go

@@ -315,7 +315,7 @@ func EditUser(ctx *context.Context) {
 	ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations
 	ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice()
 	ctx.Data["DisableGravatar"] = system_model.GetSettingWithCacheBool(ctx, system_model.KeyPictureDisableGravatar)
-
+	ctx.Data["Link"] = "/admin/users/" + ctx.Params(":userid")
 	prepareUserInfo(ctx)
 	if ctx.Written() {
 		return

routers/web/web.go

@@ -575,9 +575,9 @@ func registerRoutes(m *web.Route) {
 			m.Combo("/new").Get(admin.NewUser).Post(web.Bind(forms.AdminCreateUserForm{}), admin.NewUserPost)
 			m.Get("/{userid}", admin.ViewUser)
 			m.Combo("/{userid}/edit").Get(admin.EditUser).Post(web.Bind(forms.AdminEditUserForm{}), admin.EditUserPost)
-			m.Post("/{userid}/edit/delete", admin.DeleteUser)
-			m.Post("/{userid}/edit/avatar", web.Bind(forms.AvatarForm{}), admin.AvatarPost)
-			m.Post("/{userid}/edit/avatar/delete", admin.DeleteAvatar)
+			m.Post("/{userid}/delete", admin.DeleteUser)
+			m.Post("/{userid}/avatar", web.Bind(forms.AvatarForm{}), admin.AvatarPost)
+			m.Post("/{userid}/avatar/delete", admin.DeleteAvatar)
 		})
 
 		m.Group("/emails", func() {

tests/integration/admin_user_test.go

@@ -73,7 +73,7 @@ func TestAdminDeleteUser(t *testing.T) {
 	session := loginUser(t, "user1")
 
 	csrf := GetCSRF(t, session, "/admin/users/8/edit")
-	req := NewRequestWithValues(t, "POST", "/admin/users/8/edit/delete", map[string]string{
+	req := NewRequestWithValues(t, "POST", "/admin/users/8/delete", map[string]string{
 		"_csrf": csrf,
 	})
 	session.MakeRequest(t, req, http.StatusSeeOther)