Ignore deactivated players in search and in player views.

diff --git a/xonstat/views/player.py b/xonstat/views/player.py
index fedb99b328219706ca77fada061fce97e385b6c1..5e82da74a8b0b7af3ce673d6f9ad9d10963def17 100755 (executable)
--- a/xonstat/views/player.py
+++ b/xonstat/views/player.py
@@ -25,6 +25,7 @@ def player_index(request):
     try:\r
         player_q = DBSession.query(Player).\\r
                 filter(Player.player_id > 2).\\r
+                filter(Player.active_ind == True).\\r
                 filter(sa.not_(Player.nick.like('Anonymous Player%'))).\\r
                 order_by(Player.player_id.desc())\r
 \r
@@ -54,7 +55,8 @@ def player_info(request):
         player_id = -1;\r
         \r
     try:\r
-        player = DBSession.query(Player).filter_by(player_id=player_id).one()\r
+        player = DBSession.query(Player).filter_by(player_id=player_id).\\r
+                filter(Player.active_ind == True).one()\r
 \r
         weapon_stats = DBSession.query("descr", "weapon_cd", "actual_total", \r
                 "max_total", "hit_total", "fired_total", "frags_total").\\r

diff --git a/xonstat/views/search.py b/xonstat/views/search.py
index f888a698eb7edcec436a03187a0cc7bc985a330f..42f18875f7d28a72d8bfa13b7ed5642daa1e931b 100755 (executable)
--- 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