From 2d1a035877454d6a193ceea057fd4970fb73dd13 Mon Sep 17 00:00:00 2001 From: Didier Link Date: Thu, 21 Jun 2018 11:58:54 +0200 Subject: [PATCH] partially solve #68 --- src/routes/errors.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/routes/errors.rs b/src/routes/errors.rs index 68ca682e..83c71795 100644 --- a/src/routes/errors.rs +++ b/src/routes/errors.rs @@ -1,15 +1,22 @@ use rocket_contrib::Template; +use rocket::Request; +use rocket::request::FromRequest; +use models::users::User; #[catch(404)] -fn not_found() -> Template { +fn not_found(req: &Request) -> Template { + let user = User::from_request(req).succeeded(); Template::render("errors/404", json!({ - "error_message": "Page not found" + "error_message": "Page not found", + "account": user })) } #[catch(500)] -fn server_error() -> Template { +fn server_error(req: &Request) -> Template { + let user = User::from_request(req).succeeded(); Template::render("errors/500", json!({ - "error_message": "Server error" + "error_message": "Server error", + "account": user })) }