fixed retagging bug for django 1.4

2 files changed, 10 insertions, 3 deletions

diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index fd60590c..e83a92c8 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -130,6 +130,10 @@ class RelatedObjectSimulator(object):
         self.user = user
         self.model_class = model_class
 
+    def count(self, **kwargs):
+        kwargs['user'] = self.user
+        return self.model_class.objects.filter(**kwargs).count()
+
     def create(self, **kwargs):
         return self.model_class.objects.create(user=self.user, **kwargs)
 
@@ -137,16 +141,16 @@ class RelatedObjectSimulator(object):
         return self.model_class.objects.filter(*args, **kwargs)
 
 
-#django 1.4.1 only
+#django 1.4.1 and above
 @property
 def user_message_set(self):
     return RelatedObjectSimulator(self, Message)
 
-#django 1.4.1 only
+#django 1.4.1 and above
 def user_get_and_delete_messages(self):
     messages = []
     for message in Message.objects.filter(user=self):
-        messages.append(message)
+        messages.append(message.message)
         message.delete()
     return messages
 
diff --git a/askbot/models/message.py b/askbot/models/message.py
index 5086f515..9686e8f5 100644
--- a/askbot/models/message.py
+++ b/askbot/models/message.py
@@ -23,3 +23,6 @@ class Message(models.Model):
 
     def __unicode__(self):
         return self.message
+
+    def __str__(self):
+        return self.message.encode('utf-8')