From 081c58756c86c05ecef291b300c6fdfd5a54789b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 18 Jul 2018 18:57:24 +0100
Subject: [PATCH] web: Cleanup namespace of UI modules

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/web/ui_modules.py | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index c73a3956..c05565cf 100644
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -20,30 +20,6 @@ class UIModule(tornado.web.UIModule):
 	def backend(self):
 		return self.handler.backend
 
-	@property
-	def accounts(self):
-		return self.handler.accounts
-
-	@property
-	def banners(self):
-		return self.handler.banners
-
-	@property
-	def memcached(self):
-		return self.handler.memcached
-
-	@property
-	def releases(self):
-		return self.handler.releases
-
-	@property
-	def geoip(self):
-		return self.handler.geoip
-
-	@property
-	def talk(self):
-		return self.handler.talk
-
 
 class FireinfoDeviceTableModule(UIModule):
 	def render(self, devices):
@@ -84,7 +60,7 @@ class FireinfoGeoTableModule(UIModule):
 			if code in (None, "A1", "A2"):
 				continue
 
-			name = self.geoip.get_country_name(code)
+			name = self.backend.geoip.get_country_name(code)
 
 			# Don't add countries with a small share on the list
 			if value < 0.01:
@@ -221,7 +197,7 @@ class ProgressBarModule(UIModule):
 
 class TalkContactModule(UIModule):
         def render(self, number, name=None, application=None):
-                account = self.accounts.get_by_sip_id(number)
+                account = self.backend.accounts.get_by_sip_id(number)
 
                 return self.render_string("talk/modules/contact.html",
                         account=account, number=number, name=name, application=application)
@@ -236,7 +212,7 @@ class TalkCallLogModule(UIModule):
 		if viewer is None:
 			viewer = self.current_user
 
-		calls = self.talk.get_call_log(account)
+		calls = self.backend.talk.get_call_log(account)
 
 		return self.render_string("talk/modules/call-log.html",
 			calls=calls, viewer=viewer)
@@ -248,7 +224,7 @@ class TalkLinesModule(UIModule):
 				and not self.current_user.is_admin():
 			raise RuntimeException("Insufficient permissions")
 
-		lines = self.talk.get_lines(account)
+		lines = self.backend.talk.get_lines(account)
 
 		return self.render_string("talk/modules/lines.html",
 			show_account=show_account, lines=lines)
@@ -260,7 +236,7 @@ class TalkOngoingCallsModule(UIModule):
 				and not self.current_user.is_admin():
 			raise RuntimeException("Insufficient permissions")
 
-		channels = self.talk.get_channels()
+		channels = self.backend.talk.get_channels()
 
 		return self.render_string("talk/modules/ongoing-calls.html",
 			account=account, channels=channels, debug=debug)
-- 
2.47.2