about summary refs log tree commit diff
path: root/app/views/stream_entries
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-21 11:43:21 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-21 11:43:21 +0100
commit35aafdba961c90ecad04f38d4eec69100da36697 (patch)
tree294516de0da1177dd8bc28e774de3c4ab46ef80b /app/views/stream_entries
parent7e00a21ea6f76f8167f1070fbfe231bbd65c6cad (diff)
Ancestors and descendants of statuses
Diffstat (limited to 'app/views/stream_entries')
-rw-r--r--app/views/stream_entries/_status.html.haml5
1 files changed, 3 insertions, 2 deletions
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 }