From 91716c85936e1c8d8d23b5ae61059736ac108f80 Mon Sep 17 00:00:00 2001
From: Sebastian Lobinger <sebastian.lobinger@zib.de>
Date: Fri, 28 Jul 2017 13:11:49 +0200
Subject: [PATCH] update SAMSHub.menu to pass tests in test_sams_hub.py and fix
#29
make use of the new structure of SAMSHub_apps and _appList
---
sams_classes/sams_hub.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sams_classes/sams_hub.py b/sams_classes/sams_hub.py
index 74805da..fa727de 100644
--- a/sams_classes/sams_hub.py
+++ b/sams_classes/sams_hub.py
@@ -77,11 +77,12 @@ class SAMSHub:
def menu(self, langCode):
menu = []
- for app in self._appList:
- if self._config.get('main_app') == app.name:
- menu.extend(app.menu(langCode = langCode))
+ for appDict in self._appList:
+ if self._config.get('main_app') == appDict['app'].name:
+ menu.extend(appDict['app'].menu(langCode = langCode))
else:
- menu.extend(app.menu(langCode = langCode, urlPrefix = app.name))
+ menu.extend(appDict['app'].menu(langCode = langCode,
+ urlPrefix = appDict['urlPrefix']))
return menu
@staticmethod
--
GitLab