start alphabetical listing with a

innoq · Aug 20, 2020 · 4c368dc · 4c368dc
1 parent 82b767a
commit 4c368dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/controllers/concepts/alphabetical_controller.rb b/app/controllers/concepts/alphabetical_controller.rb
@@ -60,12 +60,13 @@ def identify_used_first_letters
   end
 
   def find_labelings
-    query = (params[:prefix] || @letters.first || 'a').mb_chars.downcase.to_s
+    letter = (@letters.include?('A')) ? 'a' : @letters.first
+    query = (params[:prefix] || letter).mb_chars.downcase.to_s
 
     Iqvoc::Concept.pref_labeling_class
       .concept_published
-      .concept_not_expired.
-      label_begins_with(query)
+      .concept_not_expired
+      .label_begins_with(query)
       .by_label_language(I18n.locale)
       .includes(:target)
       .order(Arel.sql("LOWER(#{Label::Base.table_name}.value)"))

diff --git a/app/helpers/concepts_helper.rb b/app/helpers/concepts_helper.rb
@@ -36,7 +36,8 @@ def nested_list(hash, options={})
   end
 
   def letter_selector(letters = ('A'..'Z').to_a, &block)
-    highlighted_letter = params[:prefix] || letters.first || 'a'
+    fallback = (@letters.include?('A')) ? 'a' : @letters.first
+    highlighted_letter = params[:prefix] || fallback || 'a'
     content_tag :ul, class: 'letter-selector list-unstyled' do
       letters.map do |letter|
         content_tag :li, link_to(letter, yield(letter)),