fix error
This commit is contained in:
parent
7473ab5d78
commit
f85df36098
|
@ -17,7 +17,7 @@ class AnnouncementsController < ApplicationController
|
||||||
params = @params = OrbitHelper.params
|
params = @params = OrbitHelper.params
|
||||||
page = @page || Page.where(url: params['url']).first
|
page = @page || Page.where(url: params['url']).first
|
||||||
@enable_search_flag = false
|
@enable_search_flag = false
|
||||||
@image_version = 'orignal'
|
@image_version = 'thumb'
|
||||||
if page.methods.include? 'select_option_items'.to_sym
|
if page.methods.include? 'select_option_items'.to_sym
|
||||||
ModuleApp.all.select{|tmp| tmp.key.to_s=='announcement'}.each do |modile_app|
|
ModuleApp.all.select{|tmp| tmp.key.to_s=='announcement'}.each do |modile_app|
|
||||||
@show_option_items = modile_app.show_option_items rescue nil
|
@show_option_items = modile_app.show_option_items rescue nil
|
||||||
|
|
|
@ -71,7 +71,7 @@ module Announcement
|
||||||
data[key4] = key4_attr
|
data[key4] = key4_attr
|
||||||
data_item[key_item1] = [value_item1,value_item2,value_item3]
|
data_item[key_item1] = [value_item1,value_item2,value_item3]
|
||||||
data_item[key_item2] = [value2_item1,value2_item2]
|
data_item[key_item2] = [value2_item1,value2_item2]
|
||||||
data_item[key1] = key1_attr.reverse
|
data_item[key1] = key1_attr
|
||||||
if ENV['worker_num']=='0' && File.basename($0) != 'rake' && !Rails.const_defined?('Console')
|
if ENV['worker_num']=='0' && File.basename($0) != 'rake' && !Rails.const_defined?('Console')
|
||||||
require File.expand_path('../../../app/models/anns_cache', __FILE__)
|
require File.expand_path('../../../app/models/anns_cache', __FILE__)
|
||||||
if defined?(AnnsCache)
|
if defined?(AnnsCache)
|
||||||
|
|
Loading…
Reference in New Issue