Struct with flash and error messages to differentiate in template.

2 files changed, 12 insertions, 14 deletions

diff --git a/app/handler.go b/app/handler.go
index 7dd8cc4..3f30c9f 100644
--- a/app/handler.go
+++ b/app/handler.go
@@ -57,24 +57,17 @@ func PrintRegisterHandler(w http.ResponseWriter, r *http.Request) {
 
 func PrintNewJobHandler(w http.ResponseWriter, r *http.Request) {
 	log.Println("Printing job")
-	var t string
 
 	session, err := store.Get(r, "_SID")
-	flashes := session.Flashes("success")
-	if len(flashes) > 0 {
-		t = "jobs.html"
-	} else {
-		flashes = session.Flashes("error")
-		t = "jobs_error.html"
-	}
+
+	m := FlashMessages{}
+	m.Success = session.Flashes("success")
+	m.Error = session.Flashes("error")
 	session.Save(r, w)
-	job := mainTempl.Lookup(t)
 
-	//flashes := session.Flashes()
-	//flashes := session.Flashes("success")
-	//flashes := session.Flashes("error")
-	fmt.Println(flashes)
-	err = job.ExecuteTemplate(w, t, flashes)
+	job := mainTempl.Lookup("jobs.html")
+
+	err = job.ExecuteTemplate(w, "jobs.html", m)
 	if err != nil {
 		log.Panic(err)
 	}
diff --git a/app/struct.go b/app/struct.go
index 37704d7..73e1dc7 100644
--- a/app/struct.go
+++ b/app/struct.go
@@ -36,3 +36,8 @@ type User struct {
 	DeletedAt time.Time
 	UpdatedAt time.Time
 }
+
+type FlashMessages struct {
+	Success []interface{}
+	Error   []interface{}
+}