Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from kubabrecka/fix_non_us_locale 

fix user listing and search on non-US locale
This commit is contained in:
Sam 2013-02-10 14:08:13 -08:00
parent 946255fcc4 d0c1d94918
commit 1264f628c8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/users_controller.rb
View File

@ -3,7 +3,7 @@ class Admin::UsersController < Admin::AdminController
def index
# Sort order
if params[:query] == "active"
@users = User.order("COALESCE(last_seen_at, '01-01-1970') DESC, username")
@users = User.order("COALESCE(last_seen_at, '1970-01-01') DESC, username")
else
@users = User.order("created_at DESC, username")
end

16
lib/search.rb
View File

@ -21,7 +21,7 @@ module Search
NULL AS color
FROM users AS u
JOIN users_search s on s.id = u.id
WHERE s.search_data @@ TO_TSQUERY(:query)
WHERE s.search_data @@ TO_TSQUERY('english', :query)
ORDER BY last_posted_at desc
"
end
@ -36,13 +36,13 @@ module Search
FROM topics AS ft
JOIN posts AS p ON p.topic_id = ft.id AND p.post_number = 1
JOIN posts_search s on s.id = p.id
WHERE s.search_data @@ TO_TSQUERY(:query)
WHERE s.search_data @@ TO_TSQUERY('english', :query)
AND ft.deleted_at IS NULL
AND ft.visible
AND ft.archetype <> '#{Archetype.private_message}'
ORDER BY
TS_RANK_CD(TO_TSVECTOR('english', ft.title), TO_TSQUERY(:query)) desc,
TS_RANK_CD(search_data, TO_TSQUERY(:query)) desc,
TS_RANK_CD(TO_TSVECTOR('english', ft.title), TO_TSQUERY('english', :query)) desc,
TS_RANK_CD(search_data, TO_TSQUERY('english', :query)) desc,
bumped_at desc"
end
@ -57,13 +57,13 @@ module Search
FROM topics AS ft
JOIN posts AS p ON p.topic_id = ft.id AND p.post_number <> 1
JOIN posts_search s on s.id = p.id
WHERE s.search_data @@ TO_TSQUERY(:query)
WHERE s.search_data @@ TO_TSQUERY('english', :query)
AND ft.deleted_at IS NULL and p.deleted_at IS NULL
AND ft.visible
AND ft.archetype <> '#{Archetype.private_message}'
ORDER BY
TS_RANK_CD(TO_TSVECTOR('english', ft.title), TO_TSQUERY(:query)) desc,
TS_RANK_CD(search_data, TO_TSQUERY(:query)) desc,
TS_RANK_CD(TO_TSVECTOR('english', ft.title), TO_TSQUERY('english', :query)) desc,
TS_RANK_CD(search_data, TO_TSQUERY('english', :query)) desc,
bumped_at desc"
end
@ -76,7 +76,7 @@ module Search
c.color
FROM categories AS c
JOIN categories_search s on s.id = c.id
WHERE s.search_data @@ TO_TSQUERY(:query)
WHERE s.search_data @@ TO_TSQUERY('english', :query)
ORDER BY topics_month desc
"
end