Skip to content

Commit

Permalink
can select a search tracker.
Browse files Browse the repository at this point in the history
  • Loading branch information
Doug Youch committed Jan 7, 2011
1 parent faa4549 commit ff04ed8
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 6 deletions.
14 changes: 14 additions & 0 deletions app/controllers/editor/search_renderer.rb
Expand Up @@ -48,6 +48,7 @@ def search_results
@pages[:path] << '?'
@pages[:path] << [:q, :per_page, :type].map { |ele| ! params[ele].blank? ? (ele.to_s + '=' + CGI.escape(params[ele])) : nil }.compact.join('&')

self.update_search_stats
end

render_paragraph :feature => :search_page_search_results
Expand Down Expand Up @@ -123,4 +124,17 @@ def update_search

@search.valid?
end

def update_search_stats
return unless @search.page == 1

stats_handler = Configuration.options.search_stats_handler
return if stats_handler.blank?

handler_info = get_handler_info(:webiva, :search_stats, stats_handler) unless stats_handler.blank?
return unless handler_info

visitor = DomainLogVisitor.find_by_id session[:domain_log_visitor][:id]
handler_info[:class].update_search_stats(myself, visitor, @search)
end
end
1 change: 1 addition & 0 deletions app/controllers/options_controller.rb
Expand Up @@ -144,6 +144,7 @@ def domain_options
@member_tabs = handlers.map {|elm| [ elm[:name], elm[:identifier].to_s ] }

@search_handler_options = [['--Use Internal Search Engine--',nil]] + get_handler_options(:webiva,:search)
@search_stats_handler_options = [['--Select a Search Tracker--',nil]] + get_handler_options(:webiva,:search_stats)
@captcha_handler_options = [['--Disable Captcha Support--',nil]] + get_handler_options(:webiva,:captcha)

end
Expand Down
16 changes: 10 additions & 6 deletions app/models/configuration.rb
Expand Up @@ -263,6 +263,7 @@ class DomainOptions < HashModel
:general_activation_template_id => nil,
:general_activation_url => nil,
:search_handler => nil,
:search_stats_handler => nil,
:site_timezone => nil,
:captcha_handler => nil,
:skip_default_feature_css => false
Expand All @@ -272,12 +273,15 @@ class DomainOptions < HashModel
boolean_options :skip_default_feature_css

def validate #:nodoc:
if !search_handler.blank?
self.errors.add(:search_handler,'is not valid') unless get_handler_values(:webiva,:search).include?(search_handler)
end
if !captcha_handler.blank?
self.errors.add(:captcha_handler,'is not valid') unless get_handler_values(:webiva,:captcha).include?(captcha_handler)
end
if !search_handler.blank?
self.errors.add(:search_handler,'is not valid') unless get_handler_values(:webiva,:search).include?(search_handler)
end
if !search_stats_handler.blank?
self.errors.add(:search_stats_handler,'is not valid') unless get_handler_values(:webiva,:search_stats).include?(search_stats_handler)
end
if !captcha_handler.blank?
self.errors.add(:captcha_handler,'is not valid') unless get_handler_values(:webiva,:captcha).include?(captcha_handler)
end
end

def one_line_address(separator = " | ")
Expand Down
2 changes: 2 additions & 0 deletions app/models/content_node_search.rb
@@ -1,5 +1,7 @@

class ContentNodeSearch < HashModel
attr_reader :total_results

attributes :terms => nil, :per_page => 10, :content_type_id => nil, :page => 1, :max_per_page => 50, :protected_results => false

integer_options :per_page, :page, :content_type_id, :max_per_page
Expand Down
1 change: 1 addition & 0 deletions app/views/options/domain_options.rhtml
Expand Up @@ -12,6 +12,7 @@
<%= f.text_area :company_address, :rows => 4, :cols =>40, :description => 'Company business address used for CAN-SPAM Compliance' %>
<%= f.text_field :page_title_prefix, :description => 'Default prefix to use before page titles' %>
<%= f.select :search_handler, @search_handler_options -%>
<%= f.select :search_stats_handler, @search_stats_handler_options -%>
<%= f.select :captcha_handler, @captcha_handler_options -%>
<%= f.select :site_timezone, [['--Use Default--',nil]] + ActiveSupport::TimeZone.all.map { |z| [z.to_s,z.name ] } -%>
<%= f.radio_buttons :skip_default_feature_css, [['Yes'.t,true],['No'.t,false]],
Expand Down

0 comments on commit ff04ed8

Please sign in to comment.