Add recent games to server info view and template.

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

diff --git a/xonstat/views.py b/xonstat/views.py
index 6807d09096ad6bcd3ec4dbe4ea01b93ddb86ebd9..c1eae6e19d311e8d171e063538f1b3b51f02775a 100755 (executable)
--- a/xonstat/views.py
+++ b/xonstat/views.py
@@ -106,9 +106,23 @@ def server_info(request):
     server_id = request.matchdict['id']
     try:
         server = DBSession.query(Server).filter_by(server_id=server_id).one()
-    except:
+        recent_games = DBSession.query("game_id", "server_id", "server_name", 
+                "map_id", "map_name").\
+                from_statement("select g.game_id, s.server_id, "
+                "s.name as server_name, m.map_id, m.name as map_name "
+                "from games g, servers s, maps m "
+                "where g.server_id=:server_id "
+                "and g.server_id = s.server_id "
+                "and g.map_id = m.map_id "
+                "order by g.start_dt desc "
+                "limit 10 offset 1").\
+                 params(server_id=server_id).all()
+
+    except Exception as e:
         server = None
-    return {'server':server}
+        recent_games = None
+    return {'server':server,
+            'recent_games':recent_games}
 
 
 ##########################################################################