fix: Add --fix-paths option to ./manage.py cms fix-tree (#7744)

fsbraun · web-flow · commit 40fa8d94e78f · 2024-01-14T11:28:14.000+01:00
diff --git a/cms/management/commands/subcommands/tree.py b/cms/management/commands/subcommands/tree.py
@@ -22,15 +22,24 @@ def get_descendants(root):
 
 
 class FixTreeCommand(SubcommandsCommand):
-    help_string = 'Repairing Materialized Path Tree for Pages'
+    help_string = 'Repairing Materialized Path Tree for Pages and Plugins'
     command_name = 'fix-tree'
 
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--fix-paths',
+            action='store_true',
+            default=False,
+            help='Fix paths for pages and plugins - takes a long time',
+        )
+
     def handle(self, *args, **options):
         """
         Repairs the tree
         """
+        fix_paths = options.get('fix_paths', False)
         self.stdout.write('fixing page tree')
-        TreeNode.fix_tree()
+        TreeNode.fix_tree(fix_paths=fix_paths)
 
         root_nodes = TreeNode.objects.filter(parent__isnull=True)
 
@@ -54,7 +63,7 @@ def handle(self, *args, **options):
             self._update_descendants_tree(root)
 
         self.stdout.write('fixing plugin tree')
-        CMSPlugin.fix_tree()
+        CMSPlugin.fix_tree(fix_paths=fix_paths)
         self.stdout.write('all done')
 
     def _update_descendants_tree(self, root):
diff --git a/cms/models/pluginmodel.py b/cms/models/pluginmodel.py
@@ -355,14 +355,14 @@ def copy_plugin(self, target_placeholder, target_language, parent_cache, no_sign
         return new_plugin
 
     @classmethod
-    def fix_tree(cls, destructive=False):
+    def fix_tree(cls, **kwargs):
         """
         Fixes the plugin tree by first calling treebeard fix_tree and the
         recalculating the correct position property for each plugin.
         """
         from cms.utils.plugins import reorder_plugins
 
-        super().fix_tree(destructive)
+        super().fix_tree(**kwargs)
         for placeholder in Placeholder.objects.all():
             for language, __ in settings.LANGUAGES:
                 order = CMSPlugin.objects.filter(
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
     'Django>=3.2',
     'django-classy-tags>=0.7.2',
     'django-formtools>=2.1',
-    'django-treebeard>=4.3',
+    'django-treebeard>=4.3,!=4.5',
     'django-sekizai>=0.7',
     'djangocms-admin-style>=1.2',
     'packaging',
