mirror of
https://github.com/hrfee/jfa-go.git
synced 2026-01-18 16:47:42 +01:00
Merge branch 'main' of github.com:hrfee/jfa-go
This commit is contained in:
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user