# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1448601367 21600
# Node ID 9fc12bbc8c8117f357e5c8257d6bebb02911263f
# Parent  fa52bfb282178ad42915e7149807cd0d0d0a6a6e
Tweaks for news v2.0 with old news pending stories present.

diff -r fa52bfb28217 -r 9fc12bbc8c81 news/admin.py
--- a/news/admin.py	Thu Nov 26 10:47:24 2015 -0600
+++ b/news/admin.py	Thu Nov 26 23:16:07 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()
 
diff -r fa52bfb28217 -r 9fc12bbc8c81 news/models.py
--- a/news/models.py	Thu Nov 26 10:47:24 2015 -0600
+++ b/news/models.py	Thu Nov 26 23:16:07 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)