From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 26 Apr 2013 13:31:17 +0000 (+0200)
Subject: Merge branch 'fix' into probarreau
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=eedba32bb0aaefbb03bf8885b5bc9dc0149c6bd3;p=django-postman.git

Merge branch 'fix' into probarreau

Conflicts:
	postman/models.py
	postman/templatetags/postman_tags.py
---

eedba32bb0aaefbb03bf8885b5bc9dc0149c6bd3
diff --cc postman/models.py
index fa592b4,9bef0d8..76ca065
--- a/postman/models.py
+++ b/postman/models.py
@@@ -43,16 -53,10 +53,9 @@@ def get_order_by(query_dict)
  
      Argument:
      ``query_dict``: a dictionary to look for a key dedicated to ordering purpose
- 
-     >>> get_order_by({})
--
-     >>> get_order_by({ORDER_BY_KEY: 'f'})
-     'sender__username'
-     >>> get_order_by({ORDER_BY_KEY: 'D'})
-     '-sent_at'
      """
      if ORDER_BY_KEY in query_dict:
-         code = query_dict[ORDER_BY_KEY] # code may be uppercase or lowercase
+         code = query_dict[ORDER_BY_KEY]  # code may be uppercase or lowercase
          order_by_field = ORDER_BY_FIELDS.get(code.lower())
          if order_by_field:
              if code.isupper():
diff --cc postman/templatetags/postman_tags.py
index da421f8,7ca48eb..43cfee8
--- a/postman/templatetags/postman_tags.py
+++ b/postman/templatetags/postman_tags.py
@@@ -30,14 -37,17 +37,20 @@@ def or_me(value, arg)
      """
      Replace the value by a fixed pattern, if it equals the argument.
  
-     Typical usage: sender|or_me:user
+     Typical usage: message.obfuscated_sender|or_me:user
  
      """
-     value = unicode(value.first_name) + ' ' + unicode(value.last_name)
-     arg = unicode(arg.first_name) + ' ' + unicode(arg.last_name)
- 
++    #value = unicode(value.first_name) + ' ' + unicode(value.last_name)
++    #arg = unicode(arg.first_name) + ' ' + unicode(arg.last_name)
++
+     user_model = get_user_model()
+     if not isinstance(value, (unicode, str)):
+         value = (get_user_representation if isinstance(value, user_model) else unicode)(value)
+     if not isinstance(arg, (unicode, str)):
+         arg = (get_user_representation if isinstance(arg, user_model) else unicode)(arg)
      return _('<me>') if value == arg else value
  
+ 
  @register.filter(**({'expects_localtime': True, 'is_safe': False} if VERSION >= (1, 4) else {}))
  def compact_date(value, arg):
      """