Merge remote-tracking branch 'origin/main' into release

griffithlab · Nov 9, 2023 · dae5f18 · dae5f18
2 parents 283246c + 51f3f38
commit dae5f18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/app/graphql/types/queries/typeahead_queries.rb b/server/app/graphql/types/queries/typeahead_queries.rb
@@ -94,7 +94,7 @@ def therapy_typeahead(query_term:)
 
             return results + secondary_results + tertiary_results
           else
-            return results + secondar_results
+            return results + secondary_results
           end
         else
           return results

diff --git a/server/app/models/therapy.rb b/server/app/models/therapy.rb
@@ -8,7 +8,7 @@ class Therapy < ApplicationRecord
   has_and_belongs_to_many :assertions
   has_and_belongs_to_many :therapy_aliases
 
-  validates :ncit_id, uniqueness: true 
+  validates :ncit_id, uniqueness: true, allow_nil: true
 
   def self.url_for(ncit_id:)
     if ncit_id.nil?