From 3ef15d64c60d943b64d998449ed0eaa1dee0ac3e Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Wed, 1 Aug 2018 13:38:35 +0200
Subject: Fix display of flash messages.

Pass full flash to template, and style according
to flash name/type.
---
 src/utils/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 57975bc..5392224 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -14,7 +14,7 @@ pub fn init_db_pool<'a>(dburl: &'a str) -> Pool {
 
 use std::ops::Deref;
 use rocket::http::Status;
-use rocket::request::{self, FromRequest};
+use rocket::request::{self, FlashMessage, FromRequest};
 use rocket::{Request, State, Outcome};
 
 // Connection request guard type: a wrapper around an r2d2 pooled connection.
@@ -44,11 +44,11 @@ impl Deref for DbConn {
     }
 }
 
-#[derive(BartDisplay, Serialize)]
+#[derive(BartDisplay)]
 #[template = "templates/layout.html"]
 pub struct Page<T: Display> {
     pub title: String,
-    pub flash: Option<String>,
+    pub flash: Option<FlashMessage>,
     pub content: T
 }
 
-- 
cgit v1.2.3