Merge lp:~dholbach/developer-ubuntu-com/1506861 into lp:developer-ubuntu-com

[Daniel Holbach]

Fix the messed up article tree after markdown article import:
 - require fresh mptt (0.7.4)
 - run 'cms fix-mptt' management command after import
Thanks a lot Daniele Procida.

Fix the messed up article tree after markdown article import:
 - require fresh mptt (0.7.4)
 - run 'cms fix-mptt' management command after import
Thanks a lot Daniele Procida.

To test either try the debug branch in https://bugs.launchpad.net/developer-ubuntu-com/+bug/1506861 or using an existing developer site branch. Then add some entries like
1|lp:snapcraft|snappy/snapcraft|intro.md
2|lp:snappy/15.04|snappy/guides/current|
3|lp:snappy|snappy/guides/devel|
to the external doc branches in the admin interface and run

 and run:
 - ./env/bin/pip -r requirements.txt install # don't use --upgrade as it'll
                                                      # try to install a newer Django(???)
 - ./env/bin/python2.7 manage.py import import-external-docs-branches

Go to the list of pages and see how they're all in the right place.

This will require us to update the pip cache and stuff.

[lp:~dholbach/developer-ubuntu-com/1506861]

159. By Daniel Holbach on 2015-10-29

move 'cms fix-mptt' out of the d'tor

[David Callé (davidc3)]

Yes!

review: Approve

=== modified file 'developer_portal/management/commands/import-external-docs-branches.py'
--- developer_portal/management/commands/import-external-docs-branches.py	2015-09-07 15:28:42 +0000
+++ developer_portal/management/commands/import-external-docs-branches.py	2015-10-29 14:50:54 +0000
@@ -1,4 +1,5 @@
 from django.core.management.base import BaseCommand
+from django.core.management import call_command
 from django.db import transaction
 
 from cms.api import create_page, add_plugin
@@ -32,7 +33,7 @@
     def remove_page(self, page_id):
         self.removed_pages += [page_id]
 
-    @transaction.commit_on_success()  # XXX: using=database
+    @transaction.commit_on_success()
     def run(self):
         for added_page in self.added_pages:
             page = get_or_create_page(**added_page)
@@ -42,6 +43,9 @@
         Page.objects.filter(id__in=self.removed_pages,
                             created_by="script").delete()
 
+        # https://stackoverflow.com/questions/33284171/
+        call_command('cms', 'fix-mptt')
+
 
 class MarkdownFile:
     html = None

=== modified file 'requirements.txt'
--- requirements.txt	2015-08-31 13:12:54 +0000
+++ requirements.txt	2015-10-29 14:50:54 +0000
@@ -20,7 +20,7 @@
 django-meta==0.2.0
 django-meta-mixin==0.1.1
 django-missing==0.1.13
-django-mptt==0.6.1
+django-mptt==0.7.4
 django-parler==1.1.1
 django-polymorphic==0.6
 django-reversion==1.8.4