Reconfigure the merge view a bit.

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index d0c033fa7f3f829148312a1bcd83805df44f361f..da42ca328d8f046b5ae31cd1766eb3d9b2dbeda7 100644 (file)
--- 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 bdc53ba0a8e2137bbda2b02ba2c1aafa1d58e15d..85fd2caf81c36fdff8ab837cbffc1a820e407607 100644 (file)
--- 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