c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

don't use turbolinks on public channels list

Browse Source
This commit is contained in:
Lee Lawlor
2014-11-19 09:18:15 -05:00
parent fefab267c2
commit 435fe52e4a
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/application_controller.rb
View File

@ -296,12 +296,17 @@ class ApplicationController < ActionController::Base
# allow more past data if necessary
get_old_data = (params[:results].present? || params[:start].present? || params[:days].present?) ? true : false
# set default start date
# set default start and end dates
start_date = (get_old_data) ? Time.parse('2010-01-01') : (Time.now - 1.day)
end_date = Time.now
start_date = (Time.now - params[:days].to_i.days) if params[:days]
start_date = ActiveSupport::TimeZone[Time.zone.name].parse(params[:start]) if params[:start]
end_date = ActiveSupport::TimeZone[Time.zone.name].parse(params[:end]) if params[:end]
# set new start and end dates if necessary
start_date = (Time.now - params[:days].to_i.days) if params[:days].present?
start_date = (Time.now - params[:minutes].to_i.minutes) if params[:minutes].present?
start_date = ActiveSupport::TimeZone[Time.zone.name].parse(params[:start]) if params[:start].present?
end_date = ActiveSupport::TimeZone[Time.zone.name].parse(params[:end]) if params[:end].present?
# set the date range
date_range = (start_date..end_date)
# only get a maximum of 30 days worth of data
date_range = (end_date - 30.days..end_date) if ((end_date - start_date) > 30.days and !get_old_data)