diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-02-12 19:21:44 -0300 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-02-12 19:21:44 -0300 |
commit | 6029548b6fe60cb76d60203f0f6ffcbb8b1a9d00 (patch) | |
tree | fb6d304b0031263add100fd2e768ab33bc0aa731 | |
parent | c59a6b2b869beae6595b8d0b35e582264712032c (diff) | |
download | askbot-6029548b6fe60cb76d60203f0f6ffcbb8b1a9d00.tar.gz askbot-6029548b6fe60cb76d60203f0f6ffcbb8b1a9d00.tar.bz2 askbot-6029548b6fe60cb76d60203f0f6ffcbb8b1a9d00.zip |
fixed retagging bug for django 1.3
-rw-r--r-- | askbot/management/commands/fix_revisionless_posts.py | 6 | ||||
-rw-r--r-- | askbot/models/__init__.py | 2 | ||||
-rw-r--r-- | askbot/models/post.py | 6 | ||||
-rw-r--r-- | askbot/models/question.py | 24 |
4 files changed, 19 insertions, 19 deletions
diff --git a/askbot/management/commands/fix_revisionless_posts.py b/askbot/management/commands/fix_revisionless_posts.py index 9535bef3..69520157 100644 --- a/askbot/management/commands/fix_revisionless_posts.py +++ b/askbot/management/commands/fix_revisionless_posts.py @@ -14,9 +14,9 @@ def fix_revisionless_posts(post_class): print 'have %d corrupted posts' % len(posts) for post in posts: post.add_revision( - author = post.author, - text = post.text, - comment = const.POST_STATUS['default_version'], + author=post.author, + text=post.text, + comment=unicode(const.POST_STATUS['default_version']), revised_at = post.added_at ) post.last_edited_at = None diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index b784d0c5..32e30add 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -1842,7 +1842,7 @@ def user_create_post_reject_reason( author = self, revised_at = timestamp, text = details, - comment = const.POST_STATUS['default_version'] + comment = unicode(const.POST_STATUS['default_version']) ) reason.details = details diff --git a/askbot/models/post.py b/askbot/models/post.py index 2d9e7a88..66004ce4 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -1809,7 +1809,7 @@ class Post(models.Model): rev_no = self.revisions.all().count() + 1 if comment in (None, ''): if rev_no == 1: - comment = const.POST_STATUS['default_version'] + comment = unicode(const.POST_STATUS['default_version']) else: comment = 'No.%s Revision' % rev_no return PostRevision.objects.create( @@ -1837,7 +1837,7 @@ class Post(models.Model): rev_no = self.revisions.all().count() + 1 if comment in (None, ''): if rev_no == 1: - comment = const.POST_STATUS['default_version'] + comment = unicode(const.POST_STATUS['default_version']) else: comment = 'No.%s Revision' % rev_no @@ -1951,7 +1951,7 @@ class Post(models.Model): else: attr = None if attr is not None: - return u'%s %s' % (self.thread.title, attr) + return u'%s %s' % (self.thread.title, unicode(attr)) else: return self.thread.title raise NotImplementedError diff --git a/askbot/models/question.py b/askbot/models/question.py index d43ebf4c..2d282fbc 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -166,7 +166,7 @@ class ThreadManager(BaseQuerySetManager): author=author, is_anonymous=is_anonymous, text=text, - comment=const.POST_STATUS['default_version'], + comment=unicode(const.POST_STATUS['default_version']), revised_at=added_at, by_email=by_email, email_address=email_address @@ -1275,10 +1275,10 @@ class Thread(models.Model): tag_names.append(tag_name) self.retag( - retagged_by = user, - retagged_at = timestamp, - tagnames = ' '.join(tag_names), - silent = silent + retagged_by=user, + retagged_at=timestamp, + tagnames=' '.join(tag_names), + silent=silent ) def retag(self, retagged_by=None, retagged_at=None, tagnames=None, silent=False): @@ -1308,13 +1308,13 @@ class Thread(models.Model): # Create a new revision latest_revision = thread_question.get_latest_revision() PostRevision.objects.create( - post = thread_question, - title = latest_revision.title, - author = retagged_by, - revised_at = retagged_at, - tagnames = tagnames, - summary = const.POST_STATUS['retagged'], - text = latest_revision.text + post=thread_question, + title=latest_revision.title, + author=retagged_by, + revised_at=retagged_at, + tagnames=tagnames, + summary=unicode(const.POST_STATUS['retagged']), + text=latest_revision.text ) def has_favorite_by_user(self, user): |