Merge branch 'development' into feature/ecoportal/align-to-agroportal…

…-3.0
lifewatch-eric · Oct 29, 2024 · 21db11f · 21db11f
2 parents 66e7f4b + 8bf8a9d
commit 21db11f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/concerns/submission_filter.rb b/app/controllers/concerns/submission_filter.rb
@@ -47,7 +47,7 @@ def submissions_paginate_filter(params)
 
     submissions = filter_submissions(@ontologies, **params)
 
-    submissions = merge_by_acronym(submissions)
+    submissions = merge_by_acronym(submissions) if federation_enabled?
 
 
     submissions = sort_submission_by(submissions, @sort_by, @search)

diff --git a/app/views/search/index.html.haml b/app/views/search/index.html.haml
@@ -15,7 +15,7 @@
                 = t("search.advanced_options.ontologies")
               .field
                 = ontologies_selector(id:'search_page_ontologies' ,name: 'ontologies[]', selected:  params[:ontologies]&.split(','), ontologies: onts_for_select(include_views: true))
-             - if federation_enabled?
+            - if federation_enabled?
               .filter-container
                 .title 
                   = t('federation.results_from_external_portals')