Skip to content

Fix the incorrect route path in the user edit page. #27007

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
delvh merged 13 commits into from
Sep 18, 2023
Merged

Fix the incorrect route path in the user edit page. #27007

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2b005e1
Fix the incorrect route path in user edit page
CaiCandong Sep 11, 2023
4195548
Fix test
CaiCandong Sep 11, 2023
3beab41
Fix
CaiCandong Sep 11, 2023
9fb8553
use BaseUrl
CaiCandong Sep 11, 2023
08e28ea
Merge branch 'main' into bugfix/Fix-the-incorrect-route-path
CaiCandong Sep 12, 2023
27da6c7
fix lint
CaiCandong Sep 12, 2023
cd2c593
fix
CaiCandong Sep 12, 2023
3a06285
Merge branch 'main' into bugfix/Fix-the-incorrect-route-path
CaiCandong Sep 13, 2023
38a0841
Merge branch 'main' into bugfix/Fix-the-incorrect-route-path
CaiCandong Sep 16, 2023
7df038b
Merge branch 'main' into bugfix/Fix-the-incorrect-route-path
CaiCandong Sep 17, 2023
b1362c7
use relative URL
CaiCandong Sep 18, 2023
de718a9
Merge branch 'bugfix/Fix-the-incorrect-route-path' of github.com:CaiC…
CaiCandong Sep 18, 2023
f7b6da3
Merge branch 'main' into bugfix/Fix-the-incorrect-route-path
GiteaBot Sep 18, 2023
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
6 changes: 3 additions & 3 deletions routers/web/web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}/delete", admin.DeleteUser)
m.Post("/{userid}/avatar", web.Bind(forms.AvatarForm{}), admin.AvatarPost)
m.Post("/{userid}/avatar/delete", admin.DeleteAvatar)
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.Group("/emails", func() {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/admin_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/delete", map[string]string{
req := NewRequestWithValues(t, "POST", "/admin/users/8/edit/delete", map[string]string{
"_csrf": csrf,
})
session.MakeRequest(t, req, http.StatusSeeOther)
Expand Down