diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-09 22:44:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-09 22:44:17 +0200 |
commit | 1110ea1a9162d5488e1ed5dbccd0803618e713f8 (patch) | |
tree | 4b1de5692c879f6345d8a4f2bf93feaa54c7a45d /app/models/custom_emoji_filter.rb | |
parent | 14d4a783cda4dd58e61bace172c3bebbe01d2ece (diff) |
Add batch actions and categories to admin UI for custom emojis (#11793)
Diffstat (limited to 'app/models/custom_emoji_filter.rb')
-rw-r--r-- | app/models/custom_emoji_filter.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/models/custom_emoji_filter.rb b/app/models/custom_emoji_filter.rb index 7649055d2..15b8da1d1 100644 --- a/app/models/custom_emoji_filter.rb +++ b/app/models/custom_emoji_filter.rb @@ -11,6 +11,8 @@ class CustomEmojiFilter scope = CustomEmoji.alphabetic params.each do |key, value| + next if key.to_s == 'page' + scope.merge!(scope_for(key, value)) if value.present? end @@ -22,13 +24,13 @@ class CustomEmojiFilter def scope_for(key, value) case key.to_s when 'local' - CustomEmoji.local + CustomEmoji.local.left_joins(:category).reorder(Arel.sql('custom_emoji_categories.name ASC NULLS FIRST, custom_emojis.shortcode ASC')) when 'remote' CustomEmoji.remote when 'by_domain' - CustomEmoji.where(domain: value.downcase) + CustomEmoji.where(domain: value.strip.downcase) when 'shortcode' - CustomEmoji.search(value) + CustomEmoji.search(value.strip) else raise "Unknown filter: #{key}" end |