Merge branch 'development'

CHANGELOG.md

@@ -51,6 +51,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - Manage synonyms includes combinations [#1628]
 - Recent and per params in source filter and controller
 - Missing ZIP dependency for docker images
+- Attempting to return geographic areas in OTU smart selector on certain conditions
 
 [#446]: https://github.com/SpeciesFileGroup/taxonworks/issues/446
 [#856]: https://github.com/SpeciesFileGroup/taxonworks/issues/856

app/javascript/vue/tasks/digitize/components/taxonDetermination/main.vue

@@ -370,5 +370,8 @@ export default {
         max-width: 150px;
       }
     }
+    .otu_tag_taxon_name {
+      white-space: pre-wrap !important;
+    }
   }
 </style>

app/models/otu.rb

@@ -331,7 +331,7 @@ def self.select_optimized(user_id, project_id, target = nil)
           Otu.where('"otus"."id" IN (?)', r.first(4) ).to_a).uniq.sort{|a,b| a.otu_name <=> b.otu_name}
     else
       h[:recent] = Otu.where(project_id: project_id).order('updated_at DESC').limit(10).to_a.sort{|a,b| a.otu_name <=> b.otu_name}
-      h[:quick] = GeographicArea.pinned_by(user_id).pinboard_inserted.where(pinboard_items: {project_id: project_id}).to_a.sort{|a,b| a.otu_name <=> b.otu_name}
+      h[:quick] = Otu.pinned_by(user_id).pinboard_inserted.where(pinboard_items: {project_id: project_id}).to_a.sort{|a,b| a.otu_name <=> b.otu_name}
     end
 
     h