From 499eb6a9bbd8da733b6073a2754e1891fe33067f Mon Sep 17 00:00:00 2001 From: Erwan Guyader Date: Mon, 16 Jun 2014 18:13:05 +0200 Subject: [PATCH] Load right stream with Show More on mobile - Load aspects stream if user is on this stream instead of loading the activity stream --- app/helpers/stream_helper.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb index d0721b388..4753e783c 100644 --- a/app/helpers/stream_helper.rb +++ b/app/helpers/stream_helper.rb @@ -10,9 +10,12 @@ module StreamHelper 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) + elsif controller.instance_of?(StreamsController) if current_page?(:stream) stream_path(:max_time => time_for_scroll(@stream)) + elsif current_page?(:aspects_stream) + aspect_ids = (session[:a_ids] || []) + aspects_stream_path(:max_time => time_for_scroll(@stream), a_ids: aspect_ids) else activity_stream_path(:max_time => time_for_scroll(@stream)) end