# HG changeset patch
# User rbernard
# Date 1265753334 -3600
# Node ID 6d447220fd1e17dc67f5c237dcc9911b86987e77
# Parent  f436e2fef07658d5bea9df392bcbfc8445e1d53d
bug fix: removed \r in textversion's content because of a comment position bug in pre_edit. Added a save function to TextVersion to do so.

diff -r f436e2fef076 -r 6d447220fd1e src/cm/models.py
--- a/src/cm/models.py	Tue Feb 09 22:20:08 2010 +0100
+++ b/src/cm/models.py	Tue Feb 09 23:08:54 2010 +0100
@@ -1,3 +1,4 @@
+import re
 from cm.converters.pandoc_converters import \
     CHOICES_INPUT_FORMATS as CHOICES_INPUT_FORMATS_PANDOC, \
     DEFAULT_INPUT_FORMAT as DEFAULT_INPUT_FORMAT_PANDOC, pandoc_convert
@@ -139,10 +140,6 @@
 
 class TextVersionManager(KeyManager):
 
-    def save(self):
-        self.content = re.sub(r'\r\n|\r|\n', '\n', self.content)
-        super.save() 
-            
     def duplicate(self, text_version, duplicate_comments=True):
         #import pdb;pdb.set_trace()
         old_comment_set = set(text_version.comment_set.all())
@@ -271,6 +268,10 @@
 
     def get_version_number(self):
         return TextVersion.objects.filter(text__exact=self.text).order_by('created').filter(created__lte=self.created).count()
+
+    def save(self, force_insert=False, force_update=False):
+        self.content = re.sub('\r\n|\r|\n', '\n', self.content)
+        super(AuthorModel, self).save() 
     
 class CommentManager(Manager):