use main_language_label helper in ontology_viewer_page_name

ontoportal-lirmm · Sep 4, 2023 · c9c8d2a · c9c8d2a
1 parent 74a4440
commit c9c8d2a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -619,7 +619,7 @@ def get_link_for_label_xl_ajax(label_xl, ont_acronym, cls_id)
 
   ###END ruby equivalent of JS code in bp_ajax_controller.
   def ontology_viewer_page_name(ontology_name, concept_label, page)
-    ontology_name + " | " + select_language_label(concept_label)[1] + " - #{page.capitalize}"
+    ontology_name + " | " + main_language_label(concept_label) + " - #{page.capitalize}"
   end
 
 

diff --git 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
@@ -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
@@ -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