diff --git a/profiles/__init__.py b/profiles/__init__.py index 52cf40e..af10643 100644 --- a/profiles/__init__.py +++ b/profiles/__init__.py @@ -99,7 +99,7 @@ def user(uid=None, info=None): # ldap_get_member() returns a BadQueryError if getting the user's information fails. # Flask already treats a stray BadQueryError as a 404, but actually handling it prevents the traceback # from getting dumped into the log. - return render_template("404.html", message=bqe, *app.config['DATADOG_RUM_CONFIG']), 404 + return render_template("404.html", message=bqe, **app.config['DATADOG_RUM_CONFIG']), 404 @app.route("/results", methods=["POST"]) @@ -121,7 +121,7 @@ def search(searched=None, info=None): return redirect("/user/" + members[0].uid, 302) return render_template( "listing.html", info=info, title="Search Results: " + searched, - members=members, *app.config['DATADOG_RUM_CONFIG'] + members=members, **app.config['DATADOG_RUM_CONFIG'] ) @@ -134,7 +134,7 @@ def group(_group=None, info=None): if _group == "eboard": return render_template( "listing.html", info=info, title=group_desc, - members=ldap_get_eboard(), *app.config['DATADOG_RUM_CONFIG'] + members=ldap_get_eboard(), **app.config['DATADOG_RUM_CONFIG'] ) return render_template( @@ -142,7 +142,7 @@ def group(_group=None, info=None): info=info, title=group_desc, members=_ldap_get_group_members(_group), - *app.config['DATADOG_RUM_CONFIG'] + **app.config['DATADOG_RUM_CONFIG'] ) @@ -150,9 +150,13 @@ def group(_group=None, info=None): @auth.oidc_auth("default") @before_request def year(_year=None, info=None): + print(_year) return render_template( - "listing.html", info=info, title="Year: " + _year, - members=ldap_get_year(_year), *app.config['DATADOG_RUM_CONFIG'] + "listing.html", + info=info, + title="Year: " + _year, + members=ldap_get_year(_year), + **app.config['DATADOG_RUM_CONFIG'] ) @@ -189,7 +193,7 @@ def image(uid): try: return get_image(uid) except BadQueryError as bqe: - return render_template("404.html", message=bqe, *app.config['DATADOG_RUM_CONFIG']), 404 + return render_template("404.html", message=bqe, **app.config['DATADOG_RUM_CONFIG']), 404 @app.route("/clearcache") @@ -222,9 +226,9 @@ def clear_cache(info=None): @app.errorhandler(500) def handle_internal_error(e): if isinstance(e, NotFound): - return render_template("404.html", message=str(e), *app.config['DATADOG_RUM_CONFIG']), 404 + return render_template("404.html", message=str(e), **app.config['DATADOG_RUM_CONFIG']), 404 if isinstance(e.original_exception, BadQueryError): - return render_template("404.html", message=e.original_exception, *app.config['DATADOG_RUM_CONFIG']), 404 + return render_template("404.html", message=e.original_exception, **app.config['DATADOG_RUM_CONFIG']), 404 raise e.original_exception