Merge https://github.com/nyov/xonstat into nyov-header

diff --git a/xonstat/templates/player_game_index.mako b/xonstat/templates/player_game_index.mako
index d667f1b33e38c8f5c9fae079f0d9a688c8a5ba6f..5de8b1c2b7c7c251e445d680330fb9962721a0e0 100755 (executable)
--- a/xonstat/templates/player_game_index.mako
+++ b/xonstat/templates/player_game_index.mako
@@ -28,5 +28,5 @@ Game Index
 </div>
 
 <!-- navigation links -->
-${navlinks("player_game_index_paged", games.page, games.last_page, player_id=player_id)}
+${navlinks("player_game_index", games.page, games.last_page, player_id=player_id)}
 % endif

diff --git a/xonstat/views/player.py b/xonstat/views/player.py
index 5d67fb9c937c70ba3050ceb7799b26c1d6f9982b..3a35319d55db6f05ea34cb631a6521541567368c 100755 (executable)
--- a/xonstat/views/player.py
+++ b/xonstat/views/player.py
@@ -224,8 +224,8 @@ def player_game_index(request):
     """\r
     player_id = request.matchdict['player_id']\r
 \r
-    if 'page' in request.matchdict:\r
-        current_page = request.matchdict['page']\r
+    if request.params.has_key('page'):\r
+        current_page = request.params['page']\r
     else:\r
         current_page = 1\r
 \r
@@ -237,7 +237,7 @@ def player_game_index(request):
             filter(Game.map_id == Map.map_id).\\r
             order_by(Game.game_id.desc())\r
 \r
-        games = Page(games_q, current_page, url=page_url)\r
+        games = Page(games_q, current_page, items_per_page=10, url=page_url)\r
 \r
         pgstats = {}\r
         for (game, server, map) in games:\r