Use the new helpers for the server_info page as well.

[xonotic/xonstat.git] / xonstat / views / server.py

diff --git a/xonstat/views/server.py b/xonstat/views/server.py
index b2d7c6df442b7cbdd7fb5b3c0294b00c38dc9aa3..b3de5d1e2ab607163aeedb93c8fc9e2eb35c77eb 100644 (file)
--- a/xonstat/views/server.py
+++ b/xonstat/views/server.py
@@ -3,11 +3,11 @@ import sqlalchemy.sql.functions as func
 import sqlalchemy.sql.expression as expr
 import time
 from datetime import datetime, timedelta
-from pyramid.response import Response
 from sqlalchemy import desc
 from webhelpers.paginate import Page, PageURL
 from xonstat.models import *
 from xonstat.util import page_url, html_colors
+from xonstat.views.helpers import RecentGame, recent_games_q
 
 log = logging.getLogger(__name__)
 
@@ -103,13 +103,8 @@ def _server_info_data(request):
                 for (player_id, nick, score) in top_players]
 
         # recent games played in descending order
-        recent_games = DBSession.query(Game, Server, Map, PlayerGameStat).\
-            filter(Game.server_id==Server.server_id).\
-            filter(Game.map_id==Map.map_id).\
-            filter(PlayerGameStat.game_id==Game.game_id).\
-            filter(PlayerGameStat.rank==1).\
-            filter(Server.server_id==server.server_id).\
-            order_by(expr.desc(Game.start_dt)).all()[0:recent_games_count]
+        rgs = recent_games_q(server_id=server_id).limit(recent_games_count).all()
+        recent_games = [RecentGame(row) for row in rgs]
 
     except Exception as e:
         server = None