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

forum: fix exception when searching forum posts by title.

Browse Source 
ex: https://danbooru.donmai.us/forum_posts?search[topic_title_matches]=test

The is_deleted field wasn't qualified so it caused an ambiguous column
error when the forum_posts table was joined with the forum_topics table.
This commit is contained in:
evazion
2020-01-09 00:15:05 -06:00
parent e119524f20
commit 6acff3334e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/forum_topic.rb
View File

@@ -48,7 +48,7 @@ class ForumTopic < ApplicationRecord
module SearchMethods module SearchMethods
def active def active
where("is_deleted = false") where(is_deleted: false)
end end
def permitted def permitted

2
test/functional/forum_posts_controller_test.rb
View File

@@ -57,7 +57,7 @@ class ForumPostsControllerTest < ActionDispatch::IntegrationTest
context "with search conditions" do context "with search conditions" do
should "list all matching forum posts" do should "list all matching forum posts" do
get forum_posts_path, params: {:search => {:body_matches => "xxx"}} get forum_posts_path, params: { search: { body_matches: "xxx", topic_title_matches: "my forum topic" }}
assert_response :success assert_response :success
assert_select "#forum-post-#{@forum_post.id}" assert_select "#forum-post-#{@forum_post.id}"
end end