codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 04:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Error filtering for overidden values with no query

Browse source
This commit is contained in:
Robin Ward 2015-12-08 12:49:37 -05:00
parent e52852dd0f
commit d22a479c61
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/admin/site_texts_controller.rb
View file

@ -11,20 +11,21 @@ class Admin::SiteTextsController < Admin::AdminController
overridden = params[:overridden] == 'true'
extras = {}
if params[:q].blank? && !overridden
query = params[:q] || ""
if query.blank? && !overridden
extras[:recommended] = true
results = self.class.preferred_keys.map {|k| {id: k, value: I18n.t(k) }}
else
results = []
translations = I18n.search(params[:q], overridden: overridden)
translations = I18n.search(query, overridden: overridden)
translations.each do |k, v|
results << {id: k, value: v}
end
results.sort! do |x, y|
if x[:value].casecmp(params[:q]) == 0
if x[:value].casecmp(query) == 0
-1
elsif y[:value].casecmp(params[:q]) == 0
elsif y[:value].casecmp(query) == 0
1
else
(x[:id].size + x[:value].size) <=> (y[:id].size + y[:value].size)