consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use comment_flags to cache comments

Browse Source 
Flagging a comment automatically updates the comment, so the cache
expires anyway, making the `comment_flags` variable redundant.
This commit is contained in:
Javi Martín
2020-05-10 02:34:20 +02:00
parent fbaa5c2388
commit 573f861ad1
11 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/budgets/investments/show.html.erb
View File

@@ -19,7 +19,6 @@
<div class="tabs-content" data-tabs-content="investments_tabs">
<div class="tabs-panel is-active" id="tab-comments">
<%= render "/comments/comment_tree", comment_tree: @comment_tree,
comment_flags: @comment_flags,
display_comments_count: false %>
</div>

3
app/views/comments/_comment.html.erb
View File

@@ -1,10 +1,9 @@
<% comment_flags ||= @comment_flags %>
<% valuation = local_assigns.fetch(:valuation, false) %>
<% allow_votes = local_assigns.fetch(:allow_votes, true) %>
<% allow_actions = local_assigns.fetch(:allow_actions, true) %>
<% allow_comments = local_assigns.fetch(:allow_comments, true) %>
<% admin_layout = local_assigns.fetch(:admin_layout, false) %>
<% cache [locale_and_user_status(comment), comment, commentable_cache_key(comment.commentable), comment.author, (comment_flags[comment.id] if comment_flags), (admin_layout if admin_layout)] do %>
<% cache [locale_and_user_status(comment), comment, commentable_cache_key(comment.commentable), comment.author, (admin_layout if admin_layout)] do %>
<ul id="<%= dom_id(comment) %>" class="comment no-bullet small-12">
<li class="comment-body">
<% if comment.hidden? || comment.user.hidden? %>

3
app/views/comments/_comment_tree.html.erb
View File

@@ -2,7 +2,7 @@
<% valuation = local_assigns.fetch(:valuation, false) %>
<% allow_comments = local_assigns.fetch(:allow_comments, true) %>
<% admin_layout = local_assigns.fetch(:admin_layout, false) %>
<% cache [locale_and_user_status, comment_tree.order, commentable_cache_key(commentable), comment_tree.comments, comment_tree.comment_authors, commentable.comments_count, comment_flags, admin_layout] do %>
<% cache [locale_and_user_status, comment_tree.order, commentable_cache_key(commentable), comment_tree.comments, comment_tree.comment_authors, commentable.comments_count, admin_layout] do %>
<section class="expanded comments">
<div class="row">
<div id="comments" class="small-12 column">
@@ -39,7 +39,6 @@
<% comment_tree.root_comments.each do |comment| %>
<%= render "comments/comment", { comment: comment,
comment_flags: comment_flags,
valuation: valuation,
allow_votes: !valuation,
allow_actions: !valuation,

2
app/views/debates/_comments.html.erb
View File

@@ -1,4 +1,4 @@
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@debate), @comment_tree.comments, @comment_tree.comment_authors, @debate.comments_count, @comment_flags] do %>
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@debate), @comment_tree.comments, @comment_tree.comment_authors, @debate.comments_count] do %>
<div class="row comments">
<div id="comments" class="small-12 column">
<h3>

1
app/views/legislation/annotations/show.html.erb
View File

@@ -43,7 +43,6 @@
</div>
<%= render "/comments/comment_tree", comment_tree: @comment_tree,
comment_flags: @comment_flags,
display_comments_count: true %>
</div>
</div>

2
app/views/legislation/proposals/_comments.html.erb
View File

@@ -1,4 +1,4 @@
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count, @comment_flags] do %>
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count] do %>
<div class="row comments">
<div id="comments" class="small-12 column">
<%= render "shared/wide_order_selector", i18n_namespace: "comments" %>

1
app/views/legislation/questions/show.html.erb
View File

@@ -43,6 +43,5 @@
</div>
<%= render "/comments/comment_tree", comment_tree: @comment_tree,
comment_flags: @comment_flags,
display_comments_count: true %>
</section>

2
app/views/polls/_comments.html.erb
View File

@@ -1,4 +1,4 @@
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@poll), @comment_tree.comments, @comment_tree.comment_authors, @poll.comments_count, @comment_flags] do %>
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@poll), @comment_tree.comments, @comment_tree.comment_authors, @poll.comments_count] do %>
<div class="row comments">
<div id="comments" class="small-12 column">
<%= render "shared/wide_order_selector", i18n_namespace: "comments" %>

2
app/views/proposals/_comments.html.erb
View File

@@ -1,4 +1,4 @@
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count, @comment_flags] do %>
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count] do %>
<div class="row comments">
<div id="comments" class="small-12 column">
<%= render "shared/wide_order_selector", i18n_namespace: "comments" %>

2
app/views/topics/_comments.html.erb
View File

@@ -1,4 +1,4 @@
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@topic), @comment_tree.comments, @comment_tree.comment_authors, @topic.comments_count, @comment_flags] do %>
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@topic), @comment_tree.comments, @comment_tree.comment_authors, @topic.comments_count] do %>
<div class="row comments">
<div id="comments" class="small-12 column">

1
app/views/valuation/budget_investments/_valuation_comments.html.erb
View File

@@ -1,7 +1,6 @@
<h2><%= t("valuation.budget_investments.valuation_comments") %></h2>
<% unless @comment_tree.nil? %>
<%= render "/comments/comment_tree", comment_tree: @comment_tree,
comment_flags: @comment_flags,
display_comments_count: false,
valuation: true,
allow_comments: can?(:comment_valuation, @investment),