From 10ce5c83b94714b12061b5befe1157ce72ade3c1 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Mon, 15 Nov 2021 18:49:42 +0100 Subject: make test pass --- src/pydrilla/pydrilla.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/pydrilla/pydrilla.py') diff --git a/src/pydrilla/pydrilla.py b/src/pydrilla/pydrilla.py index 7300198..239267e 100644 --- a/src/pydrilla/pydrilla.py +++ b/src/pydrilla/pydrilla.py @@ -634,10 +634,10 @@ j2env = MyEnvironment(loader=PackageLoader(__package__), autoescape=False) indexpage = j2env.get_template('index.html') @bp.route('/') def index(): - return indexpage.render(content=current_app._pydrilla_resources_map) + return indexpage.render() -for item_type in ['resource', 'mapping']: - def item(identifier): +for item_type in ['mapping', 'resource']: + def item(identifier, item_type=item_type): ver = request.args.get('ver') if ver is not None: try: @@ -645,12 +645,11 @@ for item_type in ['resource', 'mapping']: except: abort(400) - item = current_app._pydrilla_content\ - .find_item(item_type, identifier, ver) - if item is None: + definition = current_app._pydrilla_content\ + .find_item(item_type, identifier, ver) + if definition is None: abort(404) - return json.dumps(item) + return json.dumps(definition) - item.__name__ = item_type + 's' - bp.route(f'/{item_type}s/')(item) + bp.add_url_rule(f'/{item_type}s/', item_type, item) -- cgit v1.2.3