From 207b87f761928b0fe03f60943b81199573060882 Mon Sep 17 00:00:00 2001 From: sentriz Date: Mon, 8 Jul 2019 19:31:59 +0100 Subject: [PATCH] add formatter things for sessAdd --- server/handler/handler_admin.go | 4 +--- server/handler/handler_admin_utils.go | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/handler/handler_admin.go b/server/handler/handler_admin.go index fa801dd..16397ad 100644 --- a/server/handler/handler_admin.go +++ b/server/handler/handler_admin.go @@ -244,9 +244,7 @@ func (c *Controller) ServeCreateUserDo(w http.ResponseWriter, r *http.Request) { } err = c.DB.Create(&user).Error if err != nil { - sessAddFlashW(fmt.Sprintf( - "could not create user `%s`: %v", username, err, - ), session) + sessAddFlashWf("could not create user `%s`: %v", session, username, err) sessLogSave(w, r, session) http.Redirect(w, r, r.Header.Get("Referer"), http.StatusSeeOther) return diff --git a/server/handler/handler_admin_utils.go b/server/handler/handler_admin_utils.go index 9741883..3ef3380 100644 --- a/server/handler/handler_admin_utils.go +++ b/server/handler/handler_admin_utils.go @@ -1,6 +1,7 @@ package handler import ( + "fmt" "log" "net/http" @@ -34,9 +35,17 @@ func sessAddFlashW(message string, s *sessions.Session) { }) } +func sessAddFlashWf(message string, s *sessions.Session, a ...interface{}) { + sessAddFlashW(fmt.Sprintf(message, a...), s) +} + func sessAddFlashN(message string, s *sessions.Session) { s.AddFlash(Flash{ Message: message, Type: "normal", }) } + +func sessAddFlashNf(message string, s *sessions.Session, a ...interface{}) { + sessAddFlashN(fmt.Sprintf(message, a...), s) +}