Merge branch 'main' of github.com:hrfee/jfa-go

This commit is contained in:
Harvey Tindall
2025-12-19 13:12:27 +00:00
3 changed files with 10 additions and 3 deletions

View File

@@ -199,7 +199,7 @@ func (app *appContext) confirmMyAction(gc *gin.Context, key string) {
// Perform an Action
if target == NoOp {
gc.Redirect(http.StatusSeeOther, PAGES.MyAccount)
gc.Redirect(http.StatusSeeOther, MustGetNonEmptyURL(PAGES.MyAccount))
return
} else if target == UserEmailChange {
app.modifyEmail(id, claims["email"].(string))
@@ -214,7 +214,7 @@ func (app *appContext) confirmMyAction(gc *gin.Context, key string) {
}, gc, true)
app.info.Printf(lm.UserEmailAdjusted, gc.GetString("jfId"))
gc.Redirect(http.StatusSeeOther, PAGES.MyAccount)
gc.Redirect(http.StatusSeeOther, MustGetNonEmptyURL(PAGES.MyAccount))
return
}
}

View File

@@ -66,6 +66,13 @@ func FixFullURL(v string) string {
return v
}
func MustGetNonEmptyURL(path string) string {
if !strings.HasPrefix(path, "/") {
return "/" + path
}
return path
}
func FormatSubpath(path string, removeSingleSlash bool) string {
if path == "/" {
if removeSingleSlash {

View File

@@ -534,7 +534,7 @@ const addEditEmail = (add: boolean): void => {
const content = window.modals.email.modal.querySelector(".content");
content.classList.remove("unfocused");
const submit = window.modals.email.modal.querySelector(".modal-submit") as HTMLButtonElement;
const submit = window.modals.email.modal.querySelector(".card").children[0] as HTMLButtonElement;
submit.onclick = () => {
addLoader(submit);
_post(