Remove the AppsController check from the next_page_path helper, since AppsController no longer exists. fixes #3280 I'd like to write a helper spec for this, but it'll probably require some stubbing/mocking and I'm a little too tired to deal with that at the moment.. so for now let's just fix the problem. :)
33 lines
1.1 KiB
Ruby
33 lines
1.1 KiB
Ruby
# Copyright (c) 2010-2011, Diaspora Inc. This file is
|
|
# licensed under the Affero General Public License version 3 or later. See
|
|
# the COPYRIGHT file.
|
|
|
|
module StreamHelper
|
|
def next_page_path(opts ={})
|
|
if controller.instance_of?(TagsController)
|
|
tag_path(:name => @stream.tag_name, :max_time => time_for_scroll(@stream))
|
|
elsif controller.instance_of?(PeopleController)
|
|
local_or_remote_person_path(@person, :max_time => time_for_scroll(@stream))
|
|
elsif controller.instance_of?(PostsController)
|
|
public_stream_path(:max_time => time_for_scroll(@stream))
|
|
elsif controller.instance_of?(StreamsController)
|
|
stream_path(:max_time => time_for_scroll(@stream))
|
|
else
|
|
raise 'in order to use pagination for this new controller, update next_page_path in stream helper'
|
|
end
|
|
end
|
|
|
|
def reshare?(post)
|
|
post.instance_of?(Reshare)
|
|
end
|
|
|
|
private
|
|
|
|
def time_for_scroll(stream)
|
|
if stream.stream_posts.empty?
|
|
(Time.now() + 1).to_i
|
|
else
|
|
stream.stream_posts.last.send(stream.order.to_sym).to_i
|
|
end
|
|
end
|
|
end
|