github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 19:02:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename to badge, better more consistent name

Browse Source
This commit is contained in:
Sam
2015-09-15 18:47:27 +10:00
parent a14d7f16c8
commit a7b34cd16b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/search.rb
View File

@ -185,7 +185,7 @@ class Search
posts.where("posts.post_number = 1") posts.where("posts.post_number = 1")
end end
advanced_filter(/with_badge:(.*)/) do |posts,match| advanced_filter(/badge:(.*)/) do |posts,match|
badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first
if badge_id if badge_id
posts.where('posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)', badge_id) posts.where('posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)', badge_id)

5
spec/components/search_spec.rb
View File

@ -402,7 +402,7 @@ describe Search do
expect(Search.execute('group:"like a brick"').posts.length).to eq(0) expect(Search.execute('group:"like a brick"').posts.length).to eq(0)
end end
it 'supports with_badge' do it 'supports badge' do
topic = Fabricate(:topic, created_at: 3.months.ago) topic = Fabricate(:topic, created_at: 3.months.ago)
post = Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic) post = Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic)
@ -410,7 +410,8 @@ describe Search do
badge = Badge.create!(name: "Like a Boss", badge_type_id: 1) badge = Badge.create!(name: "Like a Boss", badge_type_id: 1)
UserBadge.create!(user_id: post.user_id, badge_id: badge.id, granted_at: 1.minute.ago, granted_by_id: -1) UserBadge.create!(user_id: post.user_id, badge_id: badge.id, granted_at: 1.minute.ago, granted_by_id: -1)
expect(Search.execute('with_badge:"like a boss"').posts.length).to eq(1) expect(Search.execute('badge:"like a boss"').posts.length).to eq(1)
expect(Search.execute('badge:"test"').posts.length).to eq(0)
end end
it 'can search numbers correctly, and match exact phrases' do it 'can search numbers correctly, and match exact phrases' do