From 34c2314df4887868d840edb469be457ac6d73ae7 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Mon, 31 Oct 2011 23:30:02 +0100
Subject: [PATCH] findusers

---
 pandora/user/managers.py | 12 ++++++------
 pandora/user/views.py    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pandora/user/managers.py b/pandora/user/managers.py
index e42d9e8e..6a1a0d13 100644
--- a/pandora/user/managers.py
+++ b/pandora/user/managers.py
@@ -7,10 +7,10 @@ from django.db.models import Q
 def parseCondition(condition, user):
     k = condition.get('key', 'name')
     k = {
-        'email': 'user__email',
-        'firstseen': 'user__created',
-        'lastseen': 'user__last_login',
-        'user': 'user__username',
+        'firstseen': 'created',
+        'lastseen': 'last_login',
+        'user': 'username',
+        'name': 'username',
     }.get(k, k)
     v = condition['value']
     op = condition.get('operator')
@@ -30,9 +30,9 @@ def parseCondition(condition, user):
 
     key = str(key)
     if exclude:
-        q = ~Q(**{k: v})
+        q = ~Q(**{key: v})
     else:
-        q = Q(**{k: v})
+        q = Q(**{key: v})
     return q
 
 def parseConditions(conditions, operator, user):
diff --git a/pandora/user/views.py b/pandora/user/views.py
index 14677a46..faf3c246 100644
--- a/pandora/user/views.py
+++ b/pandora/user/views.py
@@ -417,6 +417,7 @@ def order_query(qs, sort):
             'firstseen': 'date_joined',
             'lastseen': 'last_login',
             'username': 'username',
+            'name': 'username',
         }.get(e['key'], 'profile__%s'%e['key'])
         if key == 'profile__numberoflists':
             qs = qs.annotate(numberoflists=Sum('lists'))
@@ -424,7 +425,6 @@ def order_query(qs, sort):
         order = '%s%s' % (operator, key)
         order_by.append(order)
     if order_by:
-        print order_by
         #user table does not support this
         #qs = qs.order_by(*order_by, nulls_last=True)
         qs = qs.order_by(*order_by)