diff --git a/app/controllers/emarketing_controller.rb b/app/controllers/emarketing_controller.rb index 943b5f24..a57ef719 100644 --- a/app/controllers/emarketing_controller.rb +++ b/app/controllers/emarketing_controller.rb @@ -233,17 +233,13 @@ def real_time_stats_request def real_time_charts_request range = (params[:range] || 5).to_i intervals = (params[:intervals] || 10).to_i - update_only = (params[:update] || 0).to_i == 1 + update_only = params[:update] site_node_id = params[:site_node_id] now = Time.now now = now.to_i - (now.to_i % range.minutes) - to = now from = now - (range*intervals).minutes - uniques = [] - hits = [] - labels = [] groups = [] if site_node_id site_node = SiteNode.find_by_id site_node_id @@ -252,6 +248,6 @@ def real_time_charts_request groups = DomainLogEntry.traffic Time.at(from), range.minutes, intervals end - return render :json => DomainLogGroup.chart_data(groups, :desc => true).merge(:range => range) + return render :json => DomainLogGroup.traffic_chart_data(groups, :desc => true, :update_only => update_only).merge(:range => range) end end