Reverting the merges due to unsuccessfull conflict resolvement.

[osqa.git] / forum_modules / sximporter / importer.py

diff --git a/forum_modules/sximporter/importer.py b/forum_modules/sximporter/importer.py
index 44f90d78cdaf73a37539f6f186a161d3fdf9bbf7..0f7f812626e23968ff072493092218a5d984a383 100644 (file)
--- a/forum_modules/sximporter/importer.py
+++ b/forum_modules/sximporter/importer.py
@@ -432,6 +432,7 @@ def postimport(dump, uidmap, tagmap):
         post.save()
 
         all.append(int(post.id))
         post.save()
 
         all.append(int(post.id))

+        create_and_activate_revision(post)

 
         del post
 
 
         del post
 


@@ -480,6 +481,8 @@ def comment_import(dump, uidmap, posts):
                 action_date = oc.added_at
                 )
 
                 action_date = oc.added_at
                 )
 

+        create_and_activate_revision(oc)
+

         create_action.save()
         oc.save()
 
         create_action.save()
         oc.save()
 


@@ -494,7 +497,6 @@ def add_tags_to_post(post, tagmap):
     tags = [tag for tag in [tagmap.get(name.strip()) for name in post.tagnames.split(u' ') if name] if tag]
     post.tagnames = " ".join([t.name for t in tags]).strip()
     post.tags = tags
     tags = [tag for tag in [tagmap.get(name.strip()) for name in post.tagnames.split(u' ') if name] if tag]
     post.tagnames = " ".join([t.name for t in tags]).strip()
     post.tags = tags

-    create_and_activate_revision(post)

 
 
 def create_and_activate_revision(post):
 
 
 def create_and_activate_revision(post):


@@ -773,6 +775,8 @@ def pages_import(dump, currid):
                 author_id = 1
                 )
 
                 author_id = 1
                 )
 

+        create_and_activate_revision(page)
+

         page.save()
         registry[sxp['url'][1:]] = page.id
 
         page.save()
         registry[sxp['url'][1:]] = page.id