From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 18 Jul 2018 18:14:47 +0000 (+0100)
Subject: web: Drop own implementation to extend the template namespace
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bff08cb0ac58821507459700aa359236e3f7ac49;p=ipfire.org.git

web: Drop own implementation to extend the template namespace

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/web/handlers_base.py b/src/web/handlers_base.py
index d740bde4..eefb235a 100644
--- a/src/web/handlers_base.py
+++ b/src/web/handlers_base.py
@@ -23,28 +23,19 @@ class BaseHandler(tornado.web.RequestHandler):
 		# Remove the development prefix
 		return self.request.host.replace(".dev.", ".")
 
-	@property
-	def render_args(self):
+	def get_template_namespace(self):
+		ns = tornado.web.RequestHandler.get_template_namespace(self)
+
 		today = datetime.date.today()
 
-		ret = {
+		ns.update({
 			"format_size" : util.format_size,
 			"format_time" : util.format_time,
 			"hostname" : self.hostname,
 			"year" : today.year,
-		}
-
-		return ret
-
-	def render(self, *args, **_kwargs):
-		kwargs = self.render_args
-		kwargs.update(_kwargs)
-		tornado.web.RequestHandler.render(self, *args, **kwargs)
+		})
 
-	def render_string(self, *args, **_kwargs):
-		kwargs = self.render_args
-		kwargs.update(_kwargs)
-		return tornado.web.RequestHandler.render_string(self, *args, **kwargs)
+		return ns
 
 	def get_remote_ip(self):
 		# Fix for clients behind a proxy that sends "X-Forwarded-For".