From 35aafdba961c90ecad04f38d4eec69100da36697 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 21 Mar 2016 11:43:21 +0100 Subject: Ancestors and descendants of statuses --- app/views/stream_entries/_status.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/views/stream_entries') diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 16f036ad3..dff03716c 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -1,5 +1,6 @@ - if status.reply? && include_threads - = render partial: 'status', locals: { status: status.thread, include_threads: false, is_predecessor: true, is_successor: false } + - status.ancestors.with_includes.with_counters.each do |status| + = render partial: 'status', locals: { status: status, include_threads: false, is_predecessor: true, is_successor: false } .entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) } - if status.reblog? @@ -32,5 +33,5 @@ = status.reblog? ? (status.reblog.local? ? linkify(status.reblog) : status.reblog.content.html_safe) : (status.local? ? linkify(status) : status.content.html_safe) - if include_threads - - status.replies.each do |status| + - status.descendants.with_includes.with_counters.each do |status| = render partial: 'status', locals: { status: status, include_threads: false, is_successor: true, is_predecessor: false } -- cgit