Fix for older versions of ActiveRecord

Andrew Kane
1 parent 8008b6e6
Showing 1 changed file with 3 additions and 2 deletions Show diff stats
lib/groupdate/magic.rb
@@ -176,9 +176,10 @@ module Groupdate
         time_range = options[:range]
         if time_range.is_a?(Range) && time_range.first.is_a?(Date)
           # convert range of dates to range of times
-          last = time_range.last.in_time_zone(time_zone)
+          # use parsing instead of in_time_zone due to Rails < 4
+          last = time_zone.parse(time_range.last.to_s)
           last += 1.day unless time_range.exclude_end?
-          time_range = Range.new(time_range.first.in_time_zone(time_zone), last, true)
+          time_range = Range.new(time_zone.parse(time_range.first.to_s), last, true)
         elsif !time_range && options[:last]
           step = 1.send(field) if 1.respond_to?(field)
           if step
...	...	@@ -176,9 +176,10 @@ module Groupdate
176	176	time_range = options[:range]
177	177	if time_range.is_a?(Range) && time_range.first.is_a?(Date)
178	178	# convert range of dates to range of times
179		- last = time_range.last.in_time_zone(time_zone)
	179	+ # use parsing instead of in_time_zone due to Rails < 4
	180	+ last = time_zone.parse(time_range.last.to_s)
180	181	last += 1.day unless time_range.exclude_end?
181		- time_range = Range.new(time_range.first.in_time_zone(time_zone), last, true)
	182	+ time_range = Range.new(time_zone.parse(time_range.first.to_s), last, true)
182	183	elsif !time_range && options[:last]
183	184	step = 1.send(field) if 1.respond_to?(field)
184	185	if step
...	...