Merge branch 'fix/wiki_menu_item_include_children' w/o pull request.

12 years ago · e653c64f4f
parent 6446d05685 4644f44087
commit e653c64f4f
1 changed files with 4 additions and 1 deletions
--- a/app/models/wiki_menu_item.rb
+++ b/app/models/wiki_menu_item.rb
@ -6,7 +6,10 @@ class WikiMenuItem < ActiveRecord::Base
  serialize :options, Hash

  named_scope :main_items, lambda { |wiki_id|
-    {:conditions => {:wiki_id => wiki_id, :parent_id => nil}, :order => 'id ASC'}
+    { :conditions => { :wiki_id => wiki_id,
+                       :parent_id => nil },
+      :include => :children,
+      :order => 'id ASC' }
  }

  attr_accessible :name, :title