From ee5ca6d4c3da42c396f8eb6cea4dbc364392c34f Mon Sep 17 00:00:00 2001
From: Sebastian Lobinger <sebastian.lobinger@zib.de>
Date: Wed, 26 Jul 2017 13:30:30 +0200
Subject: [PATCH] Revert "make use of alias feature #29 in ExampleApp"
This reverts commit f8b9a90de7fd20448d24385cbbc936bfca59bfb9.
---
ExampleApp/__init__.py | 8 ++------
ExampleApp/config/config.yaml | 5 ++---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ExampleApp/__init__.py b/ExampleApp/__init__.py
index 18bc6c0..4e6336a 100644
--- a/ExampleApp/__init__.py
+++ b/ExampleApp/__init__.py
@@ -7,9 +7,7 @@ def create_hub():
hubConf = yaml.load(f.read())
hub = SAMSHub(name= __name__, config=hubConf['exampleApp'])
hub.flaskApp.config.update(hubConf.get('flask', {}))
- for appEntry in hubConf['apps']:
- appName = appEntry['name']
- appAlias = appEntry.get('alias')
+ for appName in hubConf['apps']:
with open(appName.replace('.', '/') + '/manifest.yaml') as f:
manifest = yaml.load(f.read())
langDict = {'en': {}}
@@ -18,9 +16,7 @@ def create_hub():
singleLang = yaml.load(f.read())
langDict.update(
{os.path.splitext(os.path.basename(yaml_file))[0]: singleLang})
- hub.addApp(
- SAMSApp(name = appName, manifest = manifest, langDict = langDict),
- alias = appAlias)
+ hub.addApp(SAMSApp(name = appName, manifest = manifest, langDict = langDict))
return hub
def search_yaml_files(path, exts = ['.yaml', '.yml']):
diff --git a/ExampleApp/config/config.yaml b/ExampleApp/config/config.yaml
index de8d3a2..5ee69e5 100644
--- a/ExampleApp/config/config.yaml
+++ b/ExampleApp/config/config.yaml
@@ -5,6 +5,5 @@ exampleApp:
default_language: de
main_app: 'ExampleApp.Main'
apps:
- - name: 'ExampleApp.Main'
- - name: 'ExampleApp.Extra'
- alias: 'Extra'
\ No newline at end of file
+ - 'ExampleApp.Main'
+ - 'ExampleApp.Extra'
\ No newline at end of file
--
GitLab