tb_cms 1.2.3 → 1.3.beta1

data/app/helpers/cms/application_helper.rb

@@ -1,86 +1,74 @@
 module Cms::ApplicationHelper
-	MENU_INDEX = {}
-
-	def sp_snippet(name, snippets=nil)
-		if name.blank?
-			return ''
-		end
-		if !snippets.blank?
-			snippet = snippets.select {|s| s.name == name}
-		else
-			snippet = SpudSnippet.where(:name => name).first
-		end
-		if !snippet.blank?
-			# cache(snippet) do
-			# 	concat snippet.content_processed.html_safe
-			# end
-			snippet.content_processed.html_safe
-		else
-			return nil
-		end
-	end
-
-	def sp_list_pages(options = {})
-
-		pages = SpudPage.viewable.published_pages
-
-		start_page = nil
-		max_depth = 0
-		active_class = "menu-active"
-
-		if !options.blank?
-			if options.has_key?(:exclude)
-
-				pages = pages.where(["name NOT IN (?)",options[:exclude]])
-			end
-			if options.has_key?(:start_page_id)
-				start_page = options[:start_page_id]
-			end
-			if options.has_key?(:id)
-				content = "<ul id='#{options[:id]}' #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
-			else
-				content = "<ul #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
-			end
-			if options.has_key?(:active_class)
-				active_class = options[:acive_class]
-			end
-			if options.has_key?(:max_depth)
-				max_depth = options[:max_depth]
-			end
-
-		else
-			content = "<ul>"
-		end
-
-		pages = pages.to_a.group_by(&:spud_page_id)
-		if pages[start_page].blank?
-
-			return ""
-		end
-		pages[start_page].sort_by{|p| p.page_order}.each do |page|
-			active = false
-			if !page.url_name.blank?
-				if current_page?(page_path(:id => page.url_name))
-					active = true
-				elsif page.url_name == Spud::Cms.root_page_name && current_page?(root_path)
-					active = true
-				end
-			end
-			content += "<li class='#{active_class if active}'><a href='#{page_path(:id => page.url_name)}'>#{page.name}</a>"
-			if max_depth == 0 || max_depth > 1
-				content += sp_list_page(page,pages,2,max_depth,options)
-			end
-			content += "</li>"
-		end
-		content += "</ul>"
-
-		return content.html_safe
-	end
+  MENU_INDEX = {}.freeze
+
+  def sp_snippet(name, snippets = nil)
+    return '' if name.blank?
+    snippet = if !snippets.blank?
+                snippets.select { |s| s.name == name }
+              else
+                SpudSnippet.where(name: name).first
+              end
+    if !snippet.blank?
+      # cache(snippet) do
+      # 	concat snippet.content_processed.html_safe
+      # end
+      snippet.content_processed.html_safe
+    else
+      return nil
+    end
+  end
+
+  def sp_list_pages(options = {})
+    pages = SpudPage.viewable.published_pages
+
+    start_page = nil
+    max_depth = 0
+    active_class = 'menu-active'
+
+    if !options.blank?
+      if options.key?(:exclude)
+
+        pages = pages.where(['name NOT IN (?)', options[:exclude]])
+      end
+      start_page = options[:start_page_id] if options.key?(:start_page_id)
+      content = if options.key?(:id)
+                  "<ul id='#{options[:id]}' #{"class='#{options[:class]}'" if options.key?(:class)}>"
+                else
+                  "<ul #{"class='#{options[:class]}'" if options.key?(:class)}>"
+                end
+      active_class = options[:acive_class] if options.key?(:active_class)
+      max_depth = options[:max_depth] if options.key?(:max_depth)
+
+    else
+      content = '<ul>'
+    end
+
+    pages = pages.to_a.group_by(&:spud_page_id)
+    return '' if pages[start_page].blank?
+    pages[start_page].sort_by(&:page_order).each do |page|
+      active = false
+      unless page.url_name.blank?
+        if current_page?(page_path(id: page.url_name))
+          active = true
+        elsif page.url_name == Spud::Cms.root_page_name && current_page?(root_path)
+          active = true
+        end
+      end
+      content += "<li class='#{active_class if active}'><a href='#{page_path(id: page.url_name)}'>#{page.name}</a>"
+      if max_depth == 0 || max_depth > 1
+        content += sp_list_page(page, pages, 2, max_depth, options)
+      end
+      content += '</li>'
+    end
+    content += '</ul>'
+
+    return content.html_safe
+  end
 
   def sp_list_menu(options = {})
     options[:path] = request.original_fullpath
 
-    if !options.has_key?(:name)
+    unless options.key?(:name)
       logger.debug 'sp_list_menu require a :name option'
       return ''
     end
@@ -89,26 +77,26 @@ module Cms::ApplicationHelper
     menu_id = nil
     link_options = {}
     start_menu_item = nil
-    menu = SpudMenu.where(:name => options[:name]).first
+    menu = SpudMenu.where(name: options[:name]).first
 
     if menu.blank?
       return ''
     else
-      menu_id = menu.id  
+      menu_id = menu.id
     end
 
     cache(['sp_list_menu', menu, options]) do
-      link_options = options[:link_options] if options.has_key?(:link_options)
+      link_options = options[:link_options] if options.key?(:link_options)
 
-      start_menu_item = options[:start_menu_item_id] if options.has_key?(:start_menu_item_id)
-      if options.has_key?(:id)
-        content = "<ul id='#{options[:id]}' #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
-      else
-        content = "<ul #{"class='#{options[:class]}'" if options.has_key?(:class)}>"
-      end
-      max_depth = options[:max_depth] if options.has_key?(:max_depth)
+      start_menu_item = options[:start_menu_item_id] if options.key?(:start_menu_item_id)
+      content = if options.key?(:id)
+                  "<ul id='#{options[:id]}' #{"class='#{options[:class]}'" if options.key?(:class)}>"
+                else
+                  "<ul #{"class='#{options[:class]}'" if options.key?(:class)}>"
+                end
+      max_depth = options[:max_depth] if options.key?(:max_depth)
 
-      menu_items = SpudMenuItem.where(:spud_menu_id => menu_id).select("
+      menu_items = SpudMenuItem.where(spud_menu_id: menu_id).select("
         #{SpudMenuItem.table_name}.id as id,
         #{SpudMenuItem.table_name}.url as url,
         #{SpudMenuItem.table_name}.classes as classes,
@@ -116,25 +104,21 @@ module Cms::ApplicationHelper
         #{SpudMenuItem.table_name}.menu_order as menu_order,
         #{SpudMenuItem.table_name}.parent_id as parent_id,
         #{SpudMenuItem.table_name}.name as name,
-        #{SpudPage.table_name}.url_name as url_name").order(:parent_type,:parent_id).joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)").to_a
+        #{SpudPage.table_name}.url_name as url_name").order(:parent_type, :parent_id).joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)").to_a
 
       grouped_items = menu_items.group_by(&:parent_type)
 
-      if grouped_items["SpudMenu"].blank?
-        return ""
-      end
+      return '' if grouped_items['SpudMenu'].blank?
 
-      child_items = grouped_items["SpudMenuItem"].blank? ? [] : grouped_items["SpudMenuItem"].group_by(&:parent_id)
+      child_items = grouped_items['SpudMenuItem'].blank? ? [] : grouped_items['SpudMenuItem'].group_by(&:parent_id)
 
-      parent_items = grouped_items["SpudMenu"]
-      if start_menu_item != nil
-        parent_items = child_items[start_menu_item]
-      end
+      parent_items = grouped_items['SpudMenu']
+      parent_items = child_items[start_menu_item] unless start_menu_item.nil?
 
-      parent_items.sort_by{|p| p.menu_order}.each do |item|
+      parent_items.sort_by(&:menu_order).each do |item|
         active = false
         if !item.url_name.blank?
-          if current_page?(page_path(:id => item.url_name))
+          if current_page?(page_path(id: item.url_name))
             active = true
           elsif item.url_name == Spud::Cms.root_page_name && current_page?(root_path)
             active = true
@@ -142,32 +126,27 @@ module Cms::ApplicationHelper
         elsif current_page?(item.url)
           active = true
         end
-        link_tag = link_to item.name, !item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(:id => item.url_name))  : item.url, {:class => "#{'menu-active' if active} #{item.classes if !item.classes.blank?}"}.merge(link_options)
-        content += "<li class='#{"menu-active" if active} #{item.classes if !item.classes.blank?}'>#{link_tag}"
+        link_tag = link_to item.name, !item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(id: item.url_name)) : item.url, { class: "#{'menu-active' if active} #{item.classes unless item.classes.blank?}" }.merge(link_options)
+        content += "<li class='#{'menu-active' if active} #{item.classes unless item.classes.blank?}'>#{link_tag}"
         if max_depth == 0 || max_depth > 1
-          content += sp_list_menu_item(child_items,item.id,2,max_depth,options)
+          content += sp_list_menu_item(child_items, item.id, 2, max_depth, options)
         end
-        content += "</li>"
+        content += '</li>'
       end
 
-      content += "</ul>"
+      content += '</ul>'
 
       concat content.html_safe
     end
   end
 
-	def sp_menu_with_seperator(options={})
+  def sp_menu_with_seperator(options = {})
+    seperator = '&nbsp;|&nbsp;'.html_safe
+    seperator = options[:seperator] if options.key?(:seperator)
 
-		seperator = "&nbsp;|&nbsp;".html_safe
-		if(options.has_key?(:seperator))
-			seperator = options[:seperator]
-		end
-
-		menu = SpudMenu.find_by(:name => options[:name])
-		if(menu.blank?)
-			return ""
-		end
-		menu_items = menu.spud_menu_items_combined.select("
+    menu = SpudMenu.find_by(name: options[:name])
+    return '' if menu.blank?
+    menu_items = menu.spud_menu_items_combined.select("
 			#{SpudMenuItem.table_name}.id as id,
 			#{SpudMenuItem.table_name}.url as url,
 			#{SpudMenuItem.table_name}.classes as classes,
@@ -175,119 +154,112 @@ module Cms::ApplicationHelper
 			#{SpudMenuItem.table_name}.menu_order as menu_order,
 			#{SpudMenuItem.table_name}.parent_id as parent_id,
 			#{SpudMenuItem.table_name}.name as name,
-			#{SpudPage.table_name}.url_name as url_name").order(:parent_type,:parent_id).joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)").to_a
-
-		menu_tags = []
-		menu_items.sort_by{|p| p.menu_order}.each do |item|
-			menu_tags += ["<a #{"class='#{item.classes}' " if !item.classes.blank?}href='#{!item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(:id => item.url_name)) : item.url}'>#{item.name}</a>"]
-		end
-
-		return menu_tags.join(seperator).html_safe
-	end
-
-private
-	def sp_list_menu_item(items,item_id,depth,max_depth, options = {})
-		link_options = options.has_key?(:link_options) ? options[:link_options] : {}
-		spud_menu_items = items[item_id]
-		if spud_menu_items == nil
-			return ""
-		end
-		content = "<ul>"
-
-		spud_menu_items.sort_by{|p| p.menu_order}.each do |item|
-			active = false
-			if !item.url_name.blank?
-				if current_page?(page_path(:id => item.url_name))
-					active = true
-				elsif item.url_name == Spud::Cms.root_page_name && current_page?(root_path)
-					active = true
-				end
-			elsif current_page?(item.url)
-				active = true
-			end
-			link_tag = link_to item.name, !item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(:id => item.url_name))  : item.url, {:class => "#{'menu-active' if active} #{item.classes if !item.classes.blank?}"}.merge(link_options)
-			content += "<li class='#{"menu-active" if active} #{item.classes if !item.classes.blank?}'>#{link_tag}"
-			if max_depth == 0 || max_depth > depth
-				content += sp_list_menu_item(items,item.id,depth+1,max_depth)
-			end
-			content += "</li>"
-		end
-		content += "</ul>"
-		return content.html_safe
-	end
-
-	def sp_list_page(page,collection,depth,max_depth,options = {})
-		active_class = 'menu-active'
-		if options.has_key?(:active_class)
-			active_class = options[:active_class]
-		end
-		if collection[page.id].blank?
-			return ""
-		end
-		content = "<ul>"
-		collection[page.id].sort_by{|p| p.page_order}.each do |page|
-			active = false
-			if !page.url_name.blank?
-				if current_page?(page_path(:id => page.url_name))
-					active = true
-				elsif page.url_name == Spud::Cms.root_page_name && current_page?(root_path)
-					active = true
-				end
-			end
-
-			content += "<li class='#{active_class if active}'><a href='#{page_path(:id => page.url_name)}'>#{page.name}</a>"
-			if max_depth == 0 || max_depth > depth
-				content += sp_list_page(page,collection,depth+1,max_depth,options)
-			end
-			content += "</li>"
-		end
-		content += "</ul>"
-		return content.html_safe
-	end
-
-  def sp_list_menu_subnav(options={})
-    return_string = ""
+			#{SpudPage.table_name}.url_name as url_name").order(:parent_type, :parent_id).joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)").to_a
+
+    menu_tags = []
+    menu_items.sort_by(&:menu_order).each do |item|
+      menu_tags += ["<a #{"class='#{item.classes}' " unless item.classes.blank?}href='#{!item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(id: item.url_name)) : item.url}'>#{item.name}</a>"]
+    end
+
+    return menu_tags.join(seperator).html_safe
+  end
+
+  private
+
+  def sp_list_menu_item(items, item_id, depth, max_depth, options = {})
+    link_options = options.key?(:link_options) ? options[:link_options] : {}
+    spud_menu_items = items[item_id]
+    return '' if spud_menu_items.nil?
+    content = '<ul>'
+
+    spud_menu_items.sort_by(&:menu_order).each do |item|
+      active = false
+      if !item.url_name.blank?
+        if current_page?(page_path(id: item.url_name))
+          active = true
+        elsif item.url_name == Spud::Cms.root_page_name && current_page?(root_path)
+          active = true
+        end
+      elsif current_page?(item.url)
+        active = true
+      end
+      link_tag = link_to item.name, !item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(id: item.url_name)) : item.url, { class: "#{'menu-active' if active} #{item.classes unless item.classes.blank?}" }.merge(link_options)
+      content += "<li class='#{'menu-active' if active} #{item.classes unless item.classes.blank?}'>#{link_tag}"
+      if max_depth == 0 || max_depth > depth
+        content += sp_list_menu_item(items, item.id, depth + 1, max_depth)
+      end
+      content += '</li>'
+    end
+    content += '</ul>'
+    return content.html_safe
+  end
+
+  def sp_list_page(page, collection, depth, max_depth, options = {})
+    active_class = 'menu-active'
+    active_class = options[:active_class] if options.key?(:active_class)
+    return '' if collection[page.id].blank?
+    content = '<ul>'
+    collection[page.id].sort_by(&:page_order).each do |page|
+      active = false
+      unless page.url_name.blank?
+        if current_page?(page_path(id: page.url_name))
+          active = true
+        elsif page.url_name == Spud::Cms.root_page_name && current_page?(root_path)
+          active = true
+        end
+      end
+
+      content += "<li class='#{active_class if active}'><a href='#{page_path(id: page.url_name)}'>#{page.name}</a>"
+      if max_depth == 0 || max_depth > depth
+        content += sp_list_page(page, collection, depth + 1, max_depth, options)
+      end
+      content += '</li>'
+    end
+    content += '</ul>'
+    return content.html_safe
+  end
+
+  def sp_list_menu_subnav(options = {})
+    return_string = ''
     base_path = request.path[1..-1]
-    menu_name = "navigation"
-    classes = "subnav"
+    menu_name = 'navigation'
+    classes = 'subnav'
 
-    menu_name = options[:name] if options.has_key?(:name);
-    classes = options[:class] if options.has_key?(:class);
+    menu_name = options[:name] if options.key?(:name)
+    classes = options[:class] if options.key?(:class)
 
     menu = SpudMenu.where(name: menu_name).first
 
-    if !menu.blank?
+    unless menu.blank?
       menu_item = menu.spud_menu_items_combined
-        .joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)")
-        .where([
-          "#{SpudPage.table_name}.url_name = :base_path OR #{SpudMenuItem.table_name}.url = :base_path_slash",
-          {:base_path => base_path, :base_path_slash => "/#{base_path}"}
-        ]).first
+                      .joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)")
+                      .where([
+                               "#{SpudPage.table_name}.url_name = :base_path OR #{SpudMenuItem.table_name}.url = :base_path_slash",
+                               { base_path: base_path, base_path_slash: "/#{base_path}" }
+                             ]).first
 
-      if !menu_item.blank?
+      unless menu_item.blank?
         begin
           if menu_item.spud_menu_items.count > 0
-            return_string = sp_list_menu({class: classes, name: menu_name, start_menu_item_id: menu_item.id})
+            return_string = sp_list_menu(class: classes, name: menu_name, start_menu_item_id: menu_item.id)
           else
-            return_string = sp_list_menu({class: classes, name: menu_name, start_menu_item_id: menu_item.parent_id})
+            return_string = sp_list_menu(class: classes, name: menu_name, start_menu_item_id: menu_item.parent_id)
           end
         rescue
-          return_string = ""
+          return_string = ''
         end
       end
     end
     return return_string
   end
 
-	def layout_options
-		layouts = Spud::Cms::Engine.template_parser.layouts
-		layout_options = []
-		layouts.each_pair do |key,value|
-			layout_options << [value[:template_name],key]
-		end
-		return layout_options
-	end
-
-
+  def layout_options
+    layouts = Spud::Cms::Engine.template_parser.layouts
+    layout_options = []
+    layouts.each_pair do |key, value|
+      layout_options << [value[:template_name], key]
+    end
+    return layout_options
+  end
 
 end

data/app/models/concerns/cms_deprecated_multisite.rb

@@ -2,9 +2,9 @@ module CmsDeprecatedMultisite
   extend ActiveSupport::Concern
 
   included do
-    scope :site, ->(sid){
+    scope :site, ->(_sid) {
       ActiveSupport::Deprecation.warn 'Model.site scope is deprecated and will be removed in the future'
-      self.all()
+      all()
     }
   end
 
@@ -13,7 +13,7 @@ module CmsDeprecatedMultisite
     return 0
   end
 
-  def site_id=(id)
+  def site_id=(_id)
     ActiveSupport::Deprecation.warn '#site_id is deprecated and will be removed in the future'
     return nil
   end

data/app/models/spud_menu.rb

@@ -1,9 +1,9 @@
 class SpudMenu < ActiveRecord::Base
   include CmsDeprecatedMultisite
 
-	validates :name,:presence => true
-	validates_uniqueness_of :name
+  validates :name, presence: true
+  validates :name, uniqueness: true
 
-	has_many :spud_menu_items, :as => :parent, :dependent => :destroy
-	has_many :spud_menu_items_combined, :class_name => "SpudMenuItem", :foreign_key => :spud_menu_id, :dependent => :destroy
+  has_many :spud_menu_items, as: :parent, dependent: :destroy
+  has_many :spud_menu_items_combined, class_name: 'SpudMenuItem', foreign_key: :spud_menu_id, dependent: :destroy
 end

data/app/models/spud_menu_item.rb

@@ -1,69 +1,66 @@
 class SpudMenuItem < ActiveRecord::Base
-	belongs_to :parent, :polymorphic=>true
-	belongs_to :spud_menu, :touch => true
-	belongs_to :spud_page
-	has_many :spud_menu_items,:as => :parent,:dependent => :destroy
+  belongs_to :parent, polymorphic: true
+  belongs_to :spud_menu, touch: true
+  belongs_to :spud_page
+  has_many :spud_menu_items, as: :parent, dependent: :destroy
 
-	validates :name,:presence => true
-	validates :spud_menu_id,:presence => true
-	validates :parent_type,:presence => true
-	validates :parent_id,:presence => true
+  validates :name, presence: true
+  validates :spud_menu_id, presence: true
+  validates :parent_type, presence: true
+  validates :parent_id, presence: true
 
-	def get_url
-		if !self.spud_page.blank?
-			return self.spud_page.url_name
-		else
-			return url
-		end
-	end
+  def get_url
+    if !spud_page.blank?
+      return spud_page.url_name
+    else
+      return url
+    end
+  end
 
-	def options_tree(options,depth,current = nil)
-		sub_items = self.spud_menu_items
-		sub_items = sub_items.where(["id != ?",current.id]) if !current.blank? && !current.id.blank?
-	    if(sub_items.blank?)
-	      return options
-	    end
-	    sub_items.each do |item|
-	      options << ["#{'-'*depth} #{item.name}",item.id]
-	      options = item.options_tree(options,depth+1,current)
-	    end
-	    return options
-	end
-	def self.grouped(menu)
-		return menu.spud_menu_items_combined.group_by(&:parent_type)
-	end
+  def options_tree(options, depth, current = nil)
+    sub_items = spud_menu_items
+    sub_items = sub_items.where(['id != ?', current.id]) if !current.blank? && !current.id.blank?
+    return options if sub_items.blank?
+    sub_items.each do |item|
+      options << ["#{'-' * depth} #{item.name}", item.id]
+      options = item.options_tree(options, depth + 1, current)
+    end
+    return options
+  end
 
-	# Returns an array of pages in order of heirarchy
-	# 	:fitler Filters out a page by ID, and all of its children
-	#   :value Pick an attribute to be used in the value field, defaults to ID
-	def self.options_tree_for_item(menu,config={})
-		collection = config[:collection] || self.grouped(menu)
-		level 		 = config[:level] 		 || 0
-		parent_id  = config[:parent_id]  || nil
-		parent_type  = config[:parent_type]  || 'SpudMenu'
-		filter 		 = config[:filter] 		 || nil
-		value      = config[:value]			 || :id
-		list 			 = []
-		if parent_type == 'SpudMenu' && collection[parent_type]
-			item_collection = collection['SpudMenuItem'].group_by(&:parent_id) if collection['SpudMenuItem']
-			collection[parent_type].each do |c|
-				if filter.blank? || c.id != filter.id
-					list << [level.times.collect{ '- ' }.join('') + c.name, c[value]]
-					list += self.options_tree_for_item(menu,{:collection => item_collection, :parent_id => c.id, :level => level+1, :filter => filter,:parent_type => "SpudMenuItem"})
-				end
-			end
-		else
-			if collection[parent_id]
-				collection[parent_id].each do |c|
-					if filter.blank? || c.id != filter.id
-						list << [level.times.collect{ '- ' }.join('') + c.name, c[value]]
-						list += self.options_tree_for_item(menu,{:collection => collection, :parent_id => c.id, :level => level+1, :filter => filter,:parent_type => "SpudMenuItem"})
-					end
-				end
-			end
-		end
+  def self.grouped(menu)
+    return menu.spud_menu_items_combined.group_by(&:parent_type)
+  end
 
-		return list
-	end
+  # Returns an array of pages in order of heirarchy
+  # 	:fitler Filters out a page by ID, and all of its children
+  #   :value Pick an attribute to be used in the value field, defaults to ID
+  def self.options_tree_for_item(menu, config = {})
+    collection = config[:collection] || grouped(menu)
+    level = config[:level] || 0
+    parent_id = config[:parent_id] || nil
+    parent_type = config[:parent_type] || 'SpudMenu'
+    filter = config[:filter] || nil
+    value = config[:value] || :id
+    list = []
+    if parent_type == 'SpudMenu' && collection[parent_type]
+      item_collection = collection['SpudMenuItem'].group_by(&:parent_id) if collection['SpudMenuItem']
+      collection[parent_type].each do |c|
+        if filter.blank? || c.id != filter.id
+          list << [Array.new(level) { '- ' }.join('') + c.name, c[value]]
+          list += options_tree_for_item(menu, collection: item_collection, parent_id: c.id, level: level + 1, filter: filter, parent_type: 'SpudMenuItem')
+        end
+      end
+    else
+      collection[parent_id]&.each do |c|
+        if filter.blank? || c.id != filter.id
+          list << [Array.new(level) { '- ' }.join('') + c.name, c[value]]
+          list += options_tree_for_item(menu, collection: collection, parent_id: c.id, level: level + 1, filter: filter, parent_type: 'SpudMenuItem')
+        end
+      end
+    end
+
+    return list
+  end
 
 end