Changeset 242:716829459101

Timestamp:

17.02.2010 15:05:48 (2 years ago)

Author:

slav0nic <slav0nic0@…>

Branch:

default

Message:

From Post model removed body_text field, added updated_by field. Don't forget migrate db

Location:

djangobb/djangobb_forum

Files:

• admin.py (modified) (1 diff)
• models.py (modified) (5 diffs)
• subscription.py (modified) (3 diffs)

djangobb/djangobb_forum/admin.py

@@ -23 +23 @@
     list_display = ['topic', 'user', 'created', 'updated', 'summary']
     search_fields = ['body']
-    raw_id_fields = ['topic', 'user']
+    raw_id_fields = ['topic', 'user', 'updated_by']
 
 class ProfileAdmin(admin.ModelAdmin):

djangobb/djangobb_forum/models.py

@@ -6 +6 @@
 from django.db import models
 from django.contrib.auth.models import User, Group
-from django.utils.html import escape, strip_tags
+from django.utils.html import escape
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
@@ -173 +173 @@
     created = models.DateTimeField(_('Created'), auto_now_add=True)
     updated = models.DateTimeField(_('Updated'), blank=True, null=True)
+    updated_by = models.ForeignKey(User, verbose_name=_('Updated by'), blank=True, null=True)
     markup = models.CharField(_('Markup'), max_length=15, default=forum_settings.DEFAULT_MARKUP, choices=MARKUP_CHOICES)
     body = models.TextField(_('Message'))
     body_html = models.TextField(_('HTML version'))
-    body_text = models.TextField(_('Text version'))
     user_ip = models.IPAddressField(_('User IP'), blank=True, null=True)
 
@@ -194 +194 @@
         else:
             raise Exception('Invalid markup property: %s' % self.markup)
-        self.body_text = strip_tags(self.body_html)
         self.body_html = urlize(self.body_html)
         if forum_settings.SMILES_SUPPORT:
@@ -224 +223 @@
         except Post.DoesNotExist:
             forum.last_post = None
+        #TODO: for speedup - save/update only changed fields
         forum.post_count = Post.objects.filter(topic__forum=forum).count()
         forum.topic_count = Topic.objects.filter(forum=forum).count()
@@ -358 +358 @@
         else:
             raise Exception('Invalid markup property: %s' % self.markup)
-        #self.body_text = strip_tags(self.body_html)
         self.body_html = urlize(self.body_html)
         if forum_settings.SMILES_SUPPORT:

djangobb/djangobb_forum/subscription.py

@@ -3 +3 @@
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
+from django.utils.html import strip_tags
 
 from djangobb_forum import settings as forum_settings
@@ -45 +46 @@
 
     topic = post.topic
+    post_body_text = strip_tags(post.body_html)
     if post != topic.head:
         for user in topic.subscribers.all():
@@ -52 +54 @@
                 text_content = TOPIC_SUBSCRIPTION_TEXT_TEMPLATE % {
                         'username': post.user.username,
-                        'message': post.body_text,
+                        'message': post_body_text,
                         'post_url': absolute_url(post.get_absolute_url()),
                         'unsubscribe_url': absolute_url(reverse('djangobb:forum_delete_subscription', args=[post.topic.id])),