Updated "favorite map" to show more than one map (three by default); and updated...

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index ff148b398fb5fa777fe3c81ec649045c635b6e46..c01ff1a65d1c7a8df464aa024e71facc226545e3 100644 (file)
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -195,11 +195,31 @@ Player Information
       Games Played: <small>${total_games} (${games_breakdown_str})</small><br />
 
       % if fav_map is not None:
-      Favorite Map: <small><a href="${request.route_url('map_info', id=fav_map['id'])}" title="view map info">${fav_map['name']}</a></small><br />
+      Favorite Maps: <small>
+      <% map_list = fav_map[:3] %>
+      % for mapinfo in map_list:
+          % if mapinfo != map_list[-1]:
+              <% delim = ", " %>
+          % else:
+              <% delim = "" %>
+          % endif
+          <a href="${request.route_url('map_info', id=mapinfo['id'])}" title="view map info">${mapinfo['name']}</a>${delim}
+      % endfor
+      </small><br />
       % endif
 
       % if fav_weapon is not None:
-      Favorite Weapons: <small>${", ".join([wpn['name'] for wpn in fav_weapon[:2]])}</small><br />
+      Favorite Weapons: <small>
+      <% wpn_list = fav_weapon[:2] %>
+      % for wpninfo in wpn_list:
+          % if wpninfo != wpn_list[-1]:
+              <% delim = ", " %>
+          % else:
+              <% delim = "" %>
+          % endif
+          ${wpninfo['name']}${delim}
+      % endfor
+      </small><br />
       % endif
     </p>
   </div>

diff --git a/xonstat/views/player.py b/xonstat/views/player.py
index b7512996155997b26841d15c0fce2e5c13871941..5f211d3e84d97aa836cb5da5aeefa1dd3f786f5c 100644 (file)
--- a/xonstat/views/player.py
+++ b/xonstat/views/player.py
@@ -133,11 +133,14 @@ def _get_fav_map(player_id):
             filter(PlayerGameStat.create_dt > back_then).\
             group_by(Map.name, Map.map_id).\
             order_by(func.count().desc()).\
-            limit(1).one()
+            all()
 
-    fav_map = {}
-    fav_map['name'] = raw_fav_map[0]
-    fav_map['id'] = raw_fav_map[1]
+    fav_map = []
+    for map_e in raw_fav_map:
+        entry = {}
+        entry['name'] = map_e[0]
+        entry['id']   = map_e[1]
+        fav_map.append(entry)
 
     return fav_map
 
@@ -164,10 +167,10 @@ def _get_fav_weapon(player_id):
             all()
 
     fav_weapon = []
-    for wpn in raw_fav_weapon:
+    for wpn_e in raw_fav_weapon:
         entry = {}
-        entry['name'] = wpn[0]
-        entry['id'] = wpn[1]
+        entry['name'] = wpn_e[0]
+        entry['id']   = wpn_e[1]
         fav_weapon.append(entry)
 
     return fav_weapon