fix graphql for funders, organizations, data_catalogs. #436 #437 #441

datacite · Mar 30, 2020 · ec5087e · ec5087e
1 parent a764a9e
commit ec5087e
Show file tree

Hide file tree

Showing 49 changed files with 2,145 additions and 491 deletions.
diff --git a/app/controllers/concerns/facetable.rb b/app/controllers/concerns/facetable.rb
@@ -114,7 +114,8 @@ def facet_by_resource_type(arr)
     end
 
     def facet_by_affiliation(arr)
-      # generate hash with id and name for each provider in facet
+      # generate hash with id and name for each affiliation in facet
+      return [] if arr.blank?
 
       ids = arr.map { |hsh| "\"#{hsh["key"]}\"" }.join(" ")
       affiliations = Organization.query(ids, size: 1000)[:data] || []

diff --git a/app/controllers/dois_controller.rb b/app/controllers/dois_controller.rb
@@ -56,6 +56,7 @@ def index
                           consortium_id: params[:consortium_id],
                           client_id: params[:client_id],
                           affiliation_id: params[:affiliation_id],
+                          funder_id: params[:funder_id],
                           re3data_id: params[:re3data_id],
                           opendoar_id: params[:opendoar_id],
                           certificate: params[:certificate],