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

update deprecated finder method

Browse Source
This commit is contained in:
Lee Lawlor 2014-02-18 15:55:00 -05:00
parent 7da4d294d9
commit 4cb1c95793
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/status_controller.rb
View File

@ -35,24 +35,20 @@ class StatusController < ApplicationController
# display only 1 day by default # display only 1 day by default
params[:days] = 1 if !params[:days] params[:days] = 1 if !params[:days]
# set limits # set limits
limit = (request.format == 'csv') ? 1000000 : 8000 limit = (request.format == 'csv') ? 1000000 : 8000
limit = params[:results].to_i if (params[:results] and params[:results].to_i < 8000) limit = params[:results].to_i if (params[:results] and params[:results].to_i < 8000)
# get feed based on conditions # get feed based on conditions
@feeds = @channel.feeds.find( @feeds = @channel.feeds
:all, .where(:created_at => get_date_range(params))
:conditions => { :created_at => get_date_range(params) }, .select([:created_at, :entry_id, :status])
:select => [:created_at, :entry_id, :status], .order('created_at desc')
:order => 'created_at desc', .limit(limit)
:limit => limit
)
# sort properly # sort properly
@feeds.reverse! @feeds.reverse!
# set output correctly # set output correctly
if request.format == 'xml' if request.format == 'xml'
@channel_output = @channel.to_xml(channel_options).sub('</channel>', '').strip @channel_output = @channel.to_xml(channel_options).sub('</channel>', '').strip
@ -156,3 +152,4 @@ class StatusController < ApplicationController
end end