From 99770df9162755d3687f8a1a83254c67caeea207 Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Sat, 14 Jun 2014 06:41:50 -0400 Subject: [PATCH] Reconfigure the merge view a bit. --- xonstat/__init__.py | 4 ++-- xonstat/views/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xonstat/__init__.py b/xonstat/__init__.py index d0c033f..da42ca3 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -166,7 +166,7 @@ def main(global_config, **settings): config.add_route("login", "/login") config.add_view(login, route_name="login", check_csrf=True, renderer="json") - config.add_route("merge", "/merge") - config.add_view(route_name="merge", renderer="merge.mako", permission="merge") + config.add_route("merge", "/merge") + config.add_view(merge, route_name="merge", renderer="merge.mako") return config.make_wsgi_app() diff --git a/xonstat/views/__init__.py b/xonstat/views/__init__.py index bdc53ba..85fd2ca 100644 --- a/xonstat/views/__init__.py +++ b/xonstat/views/__init__.py @@ -29,4 +29,4 @@ from xonstat.views.exceptions import notfound from xonstat.views.main import main_index, top_players_by_time, top_servers_by_players from xonstat.views.main import top_servers_by_players, top_maps_by_times_played -from xonstat.views.admin import forbidden, login +from xonstat.views.admin import forbidden, login, merge -- 2.39.2