fix error
This commit is contained in:
parent
668e38b320
commit
1142ed9ab4
|
@ -18,7 +18,7 @@ class AsksController < ApplicationController
|
||||||
ask_question = AskQuestion.new
|
ask_question = AskQuestion.new
|
||||||
locale = I18n.locale
|
locale = I18n.locale
|
||||||
ask_settings = AskCategorySetting.where(:category_id.in=> categories.collect{|v| v.id.to_s}).to_a
|
ask_settings = AskCategorySetting.where(:category_id.in=> categories.collect{|v| v.id.to_s}).to_a
|
||||||
if ask_settings.count != 0 && ask_settings.count != categories.count
|
if ask_settings.count != categories.count
|
||||||
ask_settings = [AskSetting.first]+ask_settings
|
ask_settings = [AskSetting.first]+ask_settings
|
||||||
end
|
end
|
||||||
ask_setting = AskCategorySetting.where(category_id: categories.first.id.to_s).first
|
ask_setting = AskCategorySetting.where(category_id: categories.first.id.to_s).first
|
||||||
|
@ -115,7 +115,7 @@ class AsksController < ApplicationController
|
||||||
categories = Array(Category.find(OrbitHelper.page_categories)) rescue ['all']
|
categories = Array(Category.find(OrbitHelper.page_categories)) rescue ['all']
|
||||||
categories = module_app.categories if categories.include? 'all'
|
categories = module_app.categories if categories.include? 'all'
|
||||||
ask_settings = AskCategorySetting.where(:category_id.in=> categories.collect{|v| v.id.to_s}).to_a
|
ask_settings = AskCategorySetting.where(:category_id.in=> categories.collect{|v| v.id.to_s}).to_a
|
||||||
if ask_settings.count != 0 && ask_settings.count != categories.count
|
if ask_settings.count != categories.count
|
||||||
ask_settings = [AskSetting.first]+ask_settings
|
ask_settings = [AskSetting.first]+ask_settings
|
||||||
end
|
end
|
||||||
ask_setting = AskCategorySetting.where(category_id: categories.first.id.to_s).first
|
ask_setting = AskCategorySetting.where(category_id: categories.first.id.to_s).first
|
||||||
|
@ -182,7 +182,7 @@ class AsksController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
flag =(!ask_setting.default_setting['recaptcha'] || gotcha_valid?) && @ask_question.save
|
flag = !ask_setting.default_setting['recaptcha'] || gotcha_valid?
|
||||||
if flag
|
if flag
|
||||||
all_to_save.each do |to_save|
|
all_to_save.each do |to_save|
|
||||||
flag = flag && to_save[1].save
|
flag = flag && to_save[1].save
|
||||||
|
|
Loading…
Reference in New Issue