From a19de36f3eecbc38310477b1cf7c0bc5b12d25fb Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Thu, 26 Sep 2013 12:37:44 +0000
Subject: [PATCH] {me}

---
 pandora/item/managers.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pandora/item/managers.py b/pandora/item/managers.py
index 7b383ec4..e2cadb7f 100644
--- a/pandora/item/managers.py
+++ b/pandora/item/managers.py
@@ -14,7 +14,7 @@ import utils
 from ox.django.query import QuerySet
 
 
-def parseCondition(condition, user):
+def parseCondition(condition, user, owner=None):
     '''
     condition: {
             value: "war"
@@ -60,6 +60,17 @@ def parseCondition(condition, user):
     if k == 'list':
         key_type = ''
 
+    if v == '{me}' and op == '==':
+        if not owner:
+            owner = user
+        if k == 'user':
+            v = ownder.username
+        elif k == 'groups':
+            q = Q(groups__in=owner.groups.all())
+            if exclude:
+                q = ~q
+            return q
+
     if (not exclude and op == '=' or op in ('$', '^')) and v == '':
         return Q()
     elif k == 'filename' and (user.is_anonymous() or \
@@ -159,7 +170,7 @@ def parseCondition(condition, user):
                         data = l.query
                         q = parseConditions(data.get('conditions', []),
                                             data.get('operator', '&'),
-                                            user)
+                                            user, l.user)
                     else:
                         q = Q(id__in=l.items.all())
                     if exclude:
@@ -205,7 +216,7 @@ def parseCondition(condition, user):
             q = ~q
         return q
 
-def parseConditions(conditions, operator, user):
+def parseConditions(conditions, operator, user, owner=None):
     '''
     conditions: [
         {
@@ -228,9 +239,9 @@ def parseConditions(conditions, operator, user):
     for condition in conditions:
         if 'conditions' in condition:
             q = parseConditions(condition['conditions'],
-                             condition.get('operator', '&'), user)
+                             condition.get('operator', '&'), user, owner)
         else:
-            q = parseCondition(condition, user)
+            q = parseCondition(condition, user, owner)
         if isinstance(q, list):
             conn += q
         elif q: