jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reduce constraints for when to show forum post vote links (#3691)

Browse Source
This commit is contained in:
Albert Yi
2018-05-15 11:20:16 -07:00
parent 32ad389581
commit 308cfc2376
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/forum_post.rb
View File

@@ -139,8 +139,7 @@ class ForumPost < ApplicationRecord
end
def votable?
# shortcut to eliminate posts that are probably not tag change requests
body =~ /->/ && (bulk_update_request.present? || tag_alias.present? || tag_implication.present?) && created_at >= TagRelationship::EXPIRY.days.ago
body.to_s.match?(/->/)
end
def voted?(user, score)

2
app/views/forum_post_votes/_list.html.erb
View File

@@ -11,6 +11,6 @@
<%= render "forum_post_votes/vote", vote: vote, forum_post: forum_post %>
<% end %>
<% if forum_post.tag_change_request.is_pending? && !votes.by(CurrentUser.user.id).exists? %>
<% if forum_post.tag_change_request && forum_post.tag_change_request.is_pending? && !votes.by(CurrentUser.user.id).exists? %>
<%= render "forum_post_votes/add_vote", vote: votes.by(CurrentUser.user.id).first, forum_post: forum_post %>
<% end %>

2
app/views/forum_post_votes/_vote.html.erb
View File

@@ -4,7 +4,7 @@
%>
<li class="vote-score-<%= vote.vote_type %>">
<% if forum_post.tag_change_request.is_pending? && vote.creator_id == CurrentUser.id %>
<% if forum_post.tag_change_request && forum_post.tag_change_request.is_pending? && vote.creator_id == CurrentUser.id %>
<%= link_to content_tag(:i, nil, class: "far #{vote.fa_class}"), forum_post_votes_path(forum_post_id: forum_post.id, format: "js"), remote: true, method: :delete %>
<%= link_to_user vote.creator %>
<% else %>

9
test/functional/forum_posts_controller_test.rb
View File

@@ -15,10 +15,9 @@ class ForumPostsControllerTest < ActionDispatch::IntegrationTest
context "with votes" do
setup do
as_user do
as(@user) do
@tag_alias = create(:tag_alias, forum_post: @forum_post, status: "pending")
@vote = create(:forum_post_vote, forum_post: @forum_post, score: 1)
end
@tag_alias = create(:tag_alias, forum_post: @forum_post, status: "pending")
@vote = create(:forum_post_vote, forum_post: @forum_post, score: 1)
@forum_post.reload
end
end
@@ -41,7 +40,7 @@ class ForumPostsControllerTest < ActionDispatch::IntegrationTest
end
should "hide the vote links" do
assert_select "a[title='Vote up']"
assert_select "a[title='Vote up']", false
end
should "still render existing votes" do