From a72659760515e291263ed81a9c18375255248f3a Mon Sep 17 00:00:00 2001 From: Bohung Date: Wed, 26 May 2021 13:39:46 +0800 Subject: [PATCH] Updated. --- app/controllers/site_menu_widgets_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/site_menu_widgets_controller.rb b/app/controllers/site_menu_widgets_controller.rb index ff96237..207dbc6 100644 --- a/app/controllers/site_menu_widgets_controller.rb +++ b/app/controllers/site_menu_widgets_controller.rb @@ -2,7 +2,6 @@ class SiteMenuWidgetsController < ApplicationController def create_json(pages) items = [] pages.each do |page| - next if (!page.menu_enabled_for.include?(I18n.locale.to_s) rescue false item = {} item["obj"] = page if page.child_page.size > 0 @@ -65,11 +64,9 @@ class SiteMenuWidgetsController < ApplicationController else @pages = page.parent_page.sorted_published_child_pages if subpart.methods.include? 'select_options'.to_sym - OrbitWidget.all.select{|tmp| tmp.key.to_s=='site_menu_widget'}.each do |orbit_widget| - @show_options = orbit_widget.show_options rescue nil - end + @show_options = OrbitWidget.where(:key=>"site_menu_widget").select{|orbit_widget| (orbit_widget.methods.include?(:show_options) rescue false) }.first.show_options rescue nil subpart.select_options.each do |select_option| - if !(@show_options.nil?) && select_option.field_name == @show_options.keys.first.to_s + if (!@show_options.nil?) && (select_option.field_name == @show_options.keys.first.to_s) value = YAML.load(select_option.value) if value[I18n.locale] == t('site_menu.yes') if page.parent_page.parent_page == Page.root @@ -89,10 +86,13 @@ class SiteMenuWidgetsController < ApplicationController if value[I18n.locale] == t('site_menu.yes') @expand_layer = true @expand_next_layer = true - end + end end end end + if @expand_next_layer && !@expand_current_layer + @pages = page.sorted_published_child_pages + end end @ul_index=[] @count = -1