small fixes

SpeciesFileGroup · Dec 5, 2018 · 60a667c · 60a667c
1 parent 3b21a50
commit 60a667c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/models/protonym.rb b/app/models/protonym.rb
@@ -531,7 +531,10 @@ def original_combination_elements
     # apply gender to everything but the last
     total = r.count - 1
     r.each_with_index do |j, i|
-      unless (j.type =~ /genus/i) || i == total 
+      if j.type =~ /enus/ || i == total
+        g = nil
+      else
+      #unless (j.type =~ /genus/) || i == total
         g = gender
       end
       elements.merge! j.combination_name(g)

diff --git a/app/models/taxon_name_relationship.rb b/app/models/taxon_name_relationship.rb
@@ -518,7 +518,7 @@ def sv_objective_synonym_relationship
       s = self.subject_taxon_name
       o = self.object_taxon_name
       if (s.type_taxon_name != o.type_taxon_name ) || !s.has_same_primary_type(o)
-        soft_validations.add(:type, "Objective synonyms {s.cached_html} and #{o.cached_html} should have the same type")
+        soft_validations.add(:type, "Objective synonyms #{s.cached_html} and #{o.cached_html} should have the same type")
       end
     end
   end

diff --git a/app/models/taxon_name_relationship/original_combination.rb b/app/models/taxon_name_relationship/original_combination.rb
@@ -61,8 +61,8 @@ def monomial_prefix
   #   TODO: reconcile this format with that of full_name_hash
   def combination_name(name_gender = nil)
     elements = [monomial_prefix]
-    if !subject_taxon_name.verbatim_name.blank? # subject_taxon_name ?! TODO ?! - provide verbatim test
-      elements.push subject_taxon_name.verbatim_name 
+    if !subject_taxon_name.verbatim_name.blank? && name_gender.nil?
+      elements.push subject_taxon_name.verbatim_name
     else
       elements.push subject_taxon_name.genderized_name(name_gender)
     end

diff --git a/spec/models/taxon_name_specs/cached_spec.rb b/spec/models/taxon_name_specs/cached_spec.rb
@@ -57,7 +57,8 @@
           species.update(
             masculine_name: 'aus',
             feminine_name: 'aa',
-            neuter_name: 'aum'
+            neuter_name: 'aum',
+            verbatim_name: 'aum'
           )
 
           subspecies.update(
@@ -72,6 +73,7 @@
         end
 
         specify '#cached_original_combination' do
+          subspecies.save
           expect(subspecies.cached_original_combination).to eq('Aus aa bus')
         end