Skip to content
Snippets Groups Projects
Commit 3fc3dac3 authored by Sebastian Lobinger's avatar Sebastian Lobinger
Browse files

Merge branch 'master' into 11-write-example-app

parents f900771b a949d126
No related branches found
No related tags found
1 merge request!10Resolve "Example App schreiben"
...@@ -35,7 +35,7 @@ class SAMSHub: ...@@ -35,7 +35,7 @@ class SAMSHub:
raise TypeError('Argument app has to be a SAMSApp.') raise TypeError('Argument app has to be a SAMSApp.')
self._apps[app.name] = app self._apps[app.name] = app
self._appList.append(app) self._appList.append(app)
if app.name is self._config.get('main_app'): if app.name == self._config.get('main_app'):
self._flaskApp.register_blueprint(app.blueprint) self._flaskApp.register_blueprint(app.blueprint)
else: else:
self._flaskApp.register_blueprint( self._flaskApp.register_blueprint(
...@@ -78,7 +78,7 @@ class SAMSHub: ...@@ -78,7 +78,7 @@ class SAMSHub:
def menu(self, langCode): def menu(self, langCode):
menu = [] menu = []
for app in self._appList: for app in self._appList:
if self._config.get('main_app') is app.name: if self._config.get('main_app') == app.name:
menu.extend(app.menu(langCode = langCode)) menu.extend(app.menu(langCode = langCode))
else: else:
menu.extend(app.menu(langCode = langCode, urlPrefix = app.name)) menu.extend(app.menu(langCode = langCode, urlPrefix = app.name))
......
...@@ -53,7 +53,7 @@ class CaseSAMSHubWithMainApp(unittest.TestCase): ...@@ -53,7 +53,7 @@ class CaseSAMSHubWithMainApp(unittest.TestCase):
with self.subTest(main_app = main_app, extra_app = extra_app): with self.subTest(main_app = main_app, extra_app = extra_app):
hub = SAMSHub( hub = SAMSHub(
name = 'test', name = 'test',
config = {'default_language': 'de', 'main_app' : main_app} config = {'default_language': 'de', 'main_app' : ''.join(main_app)}
) )
expected_names = [ expected_names = [
'Hauptanwendung Punkt 1', 'Hauptanwendung Punkt 2', 'Hauptanwendung Punkt 1', 'Hauptanwendung Punkt 2',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment