diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb index 916564aac9..f1c8ca4d60 100644 --- a/app/helpers/collections_helper.rb +++ b/app/helpers/collections_helper.rb @@ -33,16 +33,7 @@ def get_collections_labels(collections, main_uri = '') end end - collections_labels.sort_by! do |s| - pref_label = s['prefLabel'] - - if pref_label.is_a? String - pref_label - else - pref_label.last - end - end - + collections_labels = sorted_labels(collections_labels) collections_labels.unshift selected_label if selected_label [collections_labels, selected_label] end diff --git a/app/helpers/multi_languages_helper.rb b/app/helpers/multi_languages_helper.rb index 5667f5891c..c52f7860d1 100644 --- a/app/helpers/multi_languages_helper.rb +++ b/app/helpers/multi_languages_helper.rb @@ -32,7 +32,7 @@ def select_language_label(concept_label, platform_languages = %i[en fr]) end def main_language_label(label) - select_language_label(label).last + select_language_label(label)&.last end def display_in_multiple_languages(label) diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index bef7cebaad..f9c67d1324 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -34,10 +34,7 @@ def get_schemes_labels(schemes, main_uri) end schemes_labels = sorted_labels(schemes_labels) - - if selected_label - schemes_labels.unshift selected_label - end + schemes_labels.unshift selected_label if selected_label [schemes_labels, selected_label] end