Fix include

Author: Kagemaru

config/initializers/decidim_zuerich_customization.rb

@@ -10,16 +10,16 @@
 
 INCLUDES = [
   #[Decidim::Debates::CreateDebateEvent,  DecidimZuerich::Debates::CreateDebateEvent],
-  [Decidim::FormBuilder,                 DecidimZuerich::FormBuilder],
-  [Decidim::Upgrade::WysiwygMigrator,    DecidimZuerich::Upgrade::WysiwygMigrator]
+  [Decidim::FormBuilder,                 DecidimZuerich::FormBuilder]
 ].freeze
 
 PREPENDS = [
   #[Decidim::ApplicationMailer,                                  DecidimZuerich::ApplicationMailer],
   #[Decidim::ParticipatoryProcesses::Permissions,                DecidimZuerich::ParticipatoryProcesses::Permissions],
   #[Decidim::Proposals::MapHelper,                               DecidimZuerich::Proposals::MapHelper],
   #[Decidim::System::RegisterOrganization,                       DecidimZuerich::System::RegisterOrganization],
-  #[Decidim::System::UpdateOrganization,                         DecidimZuerich::System::UpdateOrganization]
+  #[Decidim::System::UpdateOrganization,                         DecidimZuerich::System::UpdateOrganization],
+  [Decidim::Upgrade::WysiwygMigrator,    DecidimZuerich::Upgrade::WysiwygMigrator]
 ].freeze
 
 OVERRIDES = ['app/overrides'].freeze

lib/decidim_zuerich/upgrade/wysiwyg_migrator.rb

@@ -1,63 +1,62 @@
 module DecidimZuerich
   module Upgrade
-    class WysiwygMigrator
-      class << self
-        def convert_list(list)
-          parent = Nokogiri::XML::Node.new(list.name, doc)
-
-          create_item = lambda do
-            li = Nokogiri::XML::Node.new("li", doc)
-            paragraph = Nokogiri::XML::Node.new("p", doc)
-            li.add_child(paragraph)
-            [li, paragraph]
-          end
-          add_empty_child = lambda do |child_parent|
-            li, paragraph = create_item.call
-            child_parent.add_child(li)
-            [li, paragraph]
-          end
-
-          li = paragraph = nil
-          current_parent = parent
-          current_level = 0
-          list.children.each do |item|
-            next unless item.is_a?(Nokogiri::XML::Element) && item.name == "li"
+    module WysiwygMigrator
+      def convert_list(list)
+        parent = Nokogiri::XML::Node.new(list.name, doc)
+
+        create_item = lambda do
+          li = Nokogiri::XML::Node.new("li", doc)
+          paragraph = Nokogiri::XML::Node.new("p", doc)
+          li.add_child(paragraph)
+          [li, paragraph]
+        end
+        add_empty_child = lambda do |child_parent|
+          li, paragraph = create_item.call
+          child_parent.add_child(li)
+          [li, paragraph]
+        end
 
-            indent = detect_indent(item)
-            if indent == current_level || li.nil?
-              if item.child&.name == "p"
-                # This content has already been migrated so we do not need to
-                # re-migrate it.
-                append_node(current_parent, convert_node(item))
-                next
-              else
-                li, paragraph = add_empty_child.call(current_parent)
-              end
+        li = paragraph = nil
+        current_parent = parent
+        current_level = 0
+        list.children.each do |item|
+          next unless item.is_a?(Nokogiri::XML::Element) && item.name == "li"
+
+          indent = detect_indent(item)
+          if indent == current_level || li.nil?
+            if item.child&.name == "p"
+              # This content has already been migrated so we do not need to
+              # re-migrate it.
+              append_node(current_parent, convert_node(item))
+              next
+            else
+              puts 'item.child is empty' if item.child.nil?
+              li, paragraph = add_empty_child.call(current_parent)
             end
+          end
 
-            while indent > current_level
-              sublist = Nokogiri::XML::Node.new(list.name, doc)
-              li.add_child(sublist)
-              li, paragraph = create_item.call
-              sublist.add_child(li)
-
-              current_level += 1
-              current_parent = sublist
-            end
-            while indent < current_level
-              current_level -= 1
-              li = current_parent.parent
-              current_parent = li.parent
-              paragraph = li.child
+          while indent > current_level
+            sublist = Nokogiri::XML::Node.new(list.name, doc)
+            li.add_child(sublist)
+            li, paragraph = create_item.call
+            sublist.add_child(li)
 
-              li, paragraph = add_empty_child.call(current_parent) if indent == current_level
-            end
+            current_level += 1
+            current_parent = sublist
+          end
+          while indent < current_level
+            current_level -= 1
+            li = current_parent.parent
+            current_parent = li.parent
+            paragraph = li.child
 
-            item.children.each { |child| append_node(paragraph, convert_node(child)) }
+            li, paragraph = add_empty_child.call(current_parent) if indent == current_level
           end
 
-          parent
+          item.children.each { |child| append_node(paragraph, convert_node(child)) }
         end
+
+        parent
       end
     end
   end