From 371e4d7ce59cbe02aa409604ecc7e70d5626d965 Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Thu, 18 Apr 2013 20:30:55 -0400 Subject: [PATCH] Fix the broken things in player_game_index. - New routes were defined (/player/:id/game_type_cd) when a query parameter is the better fit. Game types are a filter condition on the resource, not the resource itself, thus should not be in the route. - Pagination was broken. Passing search_query to route_url makes the query parameters persist, although I pass query parameters in an awful way that needs to be fixed. - Multiple lines just to show the game type description when an if statement would do the same thing. - No need to pass the player_url to the template. You can reverse- generate URLs to routes with route_url just fine. - Remove the extra link back to the player_info page, as the pattern throughout the rest of the application is to click the nick itself. --- xonstat/__init__.py | 5 --- xonstat/templates/player_game_index.mako | 41 +++++++++++++----------- xonstat/views/player.py | 23 ++++++++++--- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/xonstat/__init__.py b/xonstat/__init__.py index 474c162..6f3b9d6 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -41,11 +41,6 @@ def main(global_config, **settings): config.add_view(player_game_index, route_name="player_game_index", renderer="player_game_index.mako") config.add_view(player_game_index_json, route_name="player_game_index_json", renderer="jsonp") - config.add_route("player_game_index_filtered", "/player/{player_id:\d+}/games/{game_type_cd:\w+}") - config.add_route("player_game_index_filtered_json", "/player/{player_id:\d+}/games/{game_type_cd:\w+}.json") - config.add_view(player_game_index, route_name="player_game_index_filtered", renderer="player_game_index.mako") - config.add_view(player_game_index_json, route_name="player_game_index_filtered_json", renderer="jsonp") - config.add_route("player_info", "/player/{id:\d+}") config.add_route("player_info_json", "/player/{id:\d+}.json") config.add_view(player_info, route_name="player_info", renderer="player_info.mako") diff --git a/xonstat/templates/player_game_index.mako b/xonstat/templates/player_game_index.mako index c2fd6ce..f02a6b3 100644 --- a/xonstat/templates/player_game_index.mako +++ b/xonstat/templates/player_game_index.mako @@ -16,25 +16,30 @@ Recent Games % if not games: - % if not game_type_cd: -

Sorry, no games yet. Get playing!

- % else: -

Sorry, no ${game_type_cd.upper()} games yet. Get playing!

- % endif +

Sorry, no + % if game_type_descr: + ${game_type_descr} + % endif + games yet for + ${player.nick_html_colors()|n}. Get playing! +

Back to player info page

% else:
- % if not game_type_cd: -

Recent Games by ${player.nick_html_colors()|n}

- % else: -

Recent ${game_type_cd.upper()} Games by ${player.nick_html_colors()|n}

- % endif -

Back to player info page

+

Recent + % if game_type_descr: + ${game_type_descr} + % endif + Games by + + ${player.nick_html_colors()|n} + +

-
+
    @@ -43,7 +48,7 @@ Recent Games % if game.game_type_cd == 'overall': % else: - + % endif
    ${game.game_type_cd}
    @@ -92,14 +97,14 @@ Recent Games     % if rg.elo_delta is not None: % if round(rg.elo_delta,2) > 0: - + % elif round(rg.elo_delta,2) < 0: - + % else: - + % endif % else: - + % endif @@ -112,5 +117,5 @@ Recent Games -${navlinks("player_game_index", games.page, games.last_page, player_id=player_id)} +${navlinks("player_game_index", games.page, games.last_page, player_id=player_id, search_query=request.GET)} % endif diff --git a/xonstat/views/player.py b/xonstat/views/player.py index 9529460..94fe8cb 100644 --- a/xonstat/views/player.py +++ b/xonstat/views/player.py @@ -596,10 +596,22 @@ def player_info_json(request): def player_game_index_data(request): player_id = request.matchdict['player_id'] - if request.matchdict.has_key('game_type_cd'): - game_type_cd = request.matchdict['game_type_cd'] + + game_type_cd = None + game_type_descr = None + + if request.params.has_key('game_type_cd'): + game_type_cd = request.params['game_type_cd'] + try: + game_type_descr = DBSession.query(GameType.descr).\ + filter(GameType.game_type_cd == game_type_cd).\ + one()[0] + except Exception as e: + pass + else: - game_type_cd = None + game_type_cd = None + game_type_descr = None if request.params.has_key('page'): current_page = request.params['page'] @@ -618,21 +630,22 @@ def player_game_index_data(request): # replace the items in the canned pagination class with more rich ones games.items = [RecentGame(row) for row in games.items] - + games_played = get_games_played(player_id) except Exception as e: player = None games = None game_type_cd = None + game_type_descr = None games_played = None return { 'player_id':player.player_id, - 'player_url':request.route_url('player_info', id=player_id), 'player':player, 'games':games, 'game_type_cd':game_type_cd, + 'game_type_descr':game_type_descr, 'games_played':games_played, } -- 2.39.2