From 87688aacf18b4f6696a778dc00515f0af6611c87 Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Thu, 1 Mar 2012 06:37:26 -0500 Subject: [PATCH] Ignore deactivated players in search and in player views. --- xonstat/views/player.py | 4 +++- xonstat/views/search.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xonstat/views/player.py b/xonstat/views/player.py index fedb99b..5e82da7 100755 --- a/xonstat/views/player.py +++ b/xonstat/views/player.py @@ -25,6 +25,7 @@ def player_index(request): try: player_q = DBSession.query(Player).\ filter(Player.player_id > 2).\ + filter(Player.active_ind == True).\ filter(sa.not_(Player.nick.like('Anonymous Player%'))).\ order_by(Player.player_id.desc()) @@ -54,7 +55,8 @@ def player_info(request): player_id = -1; try: - player = DBSession.query(Player).filter_by(player_id=player_id).one() + player = DBSession.query(Player).filter_by(player_id=player_id).\ + filter(Player.active_ind == True).one() weapon_stats = DBSession.query("descr", "weapon_cd", "actual_total", "max_total", "hit_total", "fired_total", "frags_total").\ diff --git a/xonstat/views/search.py b/xonstat/views/search.py index f888a69..42f1887 100755 --- a/xonstat/views/search.py +++ b/xonstat/views/search.py @@ -29,6 +29,7 @@ def search_q(nick=None, server_name=None, map_name=None, create_dt=None, q = q.filter( func.upper(Player.stripped_nick).like('%'+nick.upper()+'%')).\ filter(Player.player_id > 2).\ + filter(Player.active_ind == True).\ order_by(Player.player_id) # server-only searches -- 2.39.2