Mercurial > public > sg101

changeset 1006:842c1343061c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Brian Neal <bgneal@gmail.com>
date Thu, 26 Nov 2015 23:18:15 -0600
parents 9fc12bbc8c81 (diff) 51fce245dd47 (current diff)
children 4c0360ae01c6
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/news/admin.py	Thu Nov 26 11:13:48 2015 -0600
+++ b/news/admin.py	Thu Nov 26 23:18:15 2015 -0600
@@ -79,7 +79,8 @@
                 meta_description=pending_story.meta_description,
                 short_markup=pending_story.short_markup,
                 long_markup=pending_story.long_markup,
-                admin_content=pending_story.admin_content)
+                admin_content=pending_story.admin_content,
+                version=pending_story.version)
         story.save()
         pending_story.delete()
 
--- a/news/models.py	Thu Nov 26 11:13:48 2015 -0600
+++ b/news/models.py	Thu Nov 26 23:18:15 2015 -0600
@@ -53,7 +53,7 @@
     update_date = models.DateTimeField(db_index=True, blank=True)
     priority = models.IntegerField(db_index=True, default=0, blank=True)
     meta_description = models.TextField(blank=True)
-    short_markup = models.TextField(default='')
+    short_markup = models.TextField(default='', blank=True)
     long_markup = models.TextField(default='', blank=True)
     admin_content = models.TextField(default='', blank=True)
     version = models.SmallIntegerField(default=NEWS_VERSION)