Adjust for module authorized feature.(sub_managers)

This commit is contained in:
bohung committed 2022-03-26 15:52:56 +08:00
1 parent ec1ff2051a
commit ee94cdec5a
6 files changed
+72 -24

No files matched your search

+9 -5
View File
@@ -13,8 +13,12 @@ class AsksController < ApplicationController
read_more_page = Page.where(id: subpart.read_more_page_id).first || Page.where(:module => 'ask').first
referer_url = read_more_page ? "/#{I18n.locale}#{read_more_page.url}" : "/#{I18n.locale}/asks"
module_app = ModuleApp.where(:key => "ask").first
categories = Array(Category.find(OrbitHelper.widget_categories)) rescue ['all']
categories = module_app.categories if categories.include? 'all'
if OrbitHelper.widget_categories.include?('all')
categories = module_app.categories.enabled
else
categories = Category.where(:id.in=>OrbitHelper.widget_categories).enabled
end
categories = categories.sort_by{|category| (((module_app.asc rescue true) ? category.sort_number.to_i : -category.sort_number.to_i) rescue category.id)}
tags = module_app.tags
ask_question = AskQuestion.new
locale = I18n.locale
@@ -114,12 +118,12 @@ class AsksController < ApplicationController
end
if @layout_type == 'index'
module_app = ModuleApp.where(:key => "ask").first
categories = Array(Category.find(OrbitHelper.page_categories)) rescue ['all']
if categories.include? 'all'
if OrbitHelper.page_categories.include? 'all'
categories = module_app.categories.enabled
else
categories = categories & module_app.categories.enabled
categories = Category.where(:id.in=>OrbitHelper.page_categories).enabled
end
categories = categories.sort_by{|category| (((module_app.asc rescue true) ? category.sort_number.to_i : -category.sort_number.to_i) rescue category.id)} if !(categories.include?("all"))
ask_settings = AskCategorySetting.where(:category_id.in=> categories.collect{|v| v.id.to_s}).to_a
if ask_settings.count != categories.count
ask_settings = [AskSetting.first]+ask_settings