Merge branch 'development'

SpeciesFileGroup · Nov 5, 2021 · fbc063d · fbc063d
2 parents 14c7c33 + ada5f2a
commit fbc063d
Show file tree

Hide file tree

Showing 15 changed files with 187 additions and 128 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 \-
 
+## [0.21.1] - 2021-11-05
+### Fixed
+- Citations in image viewer
+
 ## [0.21.0] - 2021-11-04
 ### Added
 - Add new task 'Object graph', visualize and navigate your Things via a force-directed-graph (network) [#2587]
@@ -1929,7 +1933,8 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 [#1532]: https://github.com/SpeciesFileGroup/taxonworks/issues/1532
 
-[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.21.0...development
+[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.21.1...development
+[0.21.1]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.21.0...v0.21.1
 [0.21.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.20.1...v0.21.0
 [0.20.1]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.20.0...v0.20.1
 [0.20.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.19.7...v0.20.0

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -120,19 +120,20 @@ GEM
     bindex (0.8.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    brakeman (5.1.1)
+    brakeman (5.1.2)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     chartkick (4.0.5)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     chronic (0.10.2)
     chunky_png (1.4.0)
     citeproc (1.0.10)
@@ -141,7 +142,7 @@ GEM
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.6)
     climate_control (0.2.0)
-    closure_tree (7.3.0)
+    closure_tree (7.4.0)
       activerecord (>= 4.2.10)
       with_advisory_lock (>= 4.0.0)
     codecov (0.6.0)
@@ -182,7 +183,7 @@ GEM
     exception_notification (4.4.3)
       actionmailer (>= 4.0, < 7)
       activesupport (>= 4.0, < 7)
-    excon (0.85.0)
+    excon (0.88.0)
     execjs (2.8.1)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
@@ -201,7 +202,7 @@ GEM
     formatador (0.3.0)
     globalid (0.5.2)
       activesupport (>= 5.0)
-    gnfinder (0.15.4.1)
+    gnfinder (0.15.5)
       rest-client (~> 2.1)
     gpx (1.0.0)
       nokogiri (~> 1.7)
@@ -231,7 +232,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     indefinite_article (0.2.4)
       activesupport
@@ -273,15 +274,16 @@ GEM
     lumberjack (1.2.8)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     modularity (3.0.0)
@@ -311,12 +313,12 @@ GEM
     paperclip-meta (3.1.0)
       paperclip (>= 5.0)
     parallel (1.21.0)
-    parallel_tests (3.7.1)
+    parallel_tests (3.7.3)
       parallel
     parser (3.0.2.0)
       ast (~> 2.4.1)
     parslet (2.0.0)
-    passenger (6.0.10)
+    passenger (6.0.11)
       rack
       rake (>= 0.8.1)
     pdf-core (0.9.0)
@@ -338,7 +340,7 @@ GEM
       method_source (~> 1.0)
     psych (3.3.2)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -411,9 +413,9 @@ GEM
       rgeo (>= 1.0.0)
     rgeo-geojson (2.1.1)
       rgeo (>= 1.0.0)
-    rgeo-proj4 (3.0.1)
+    rgeo-proj4 (3.1.0)
       rgeo (~> 2.0)
-    rmagick (4.2.2)
+    rmagick (4.2.3)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -446,25 +448,25 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rtesseract (3.1.2)
-    rubocop (1.21.0)
+    rubocop (1.22.3)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
+    rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
     rubocop-faker (0.2.0)
       rubocop (>= 0.74)
     rubocop-performance (1.10.2)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.12.2)
+    rubocop-rails (2.12.4)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -488,8 +490,9 @@ GEM
       rdoc (>= 5.0)
     seedbank (0.5.0)
       rake (>= 10.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.0.3)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
     semantic_range (3.0.0)
     serrano (0.6.0)
@@ -506,7 +509,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    spreadsheet (1.2.9)
+    spreadsheet (1.3.0)
       ruby-ole
     spring (3.0.0)
     spring-commands-rspec (1.0.4)
@@ -547,7 +550,7 @@ GEM
     turbolinks-source (5.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -567,10 +570,10 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (4.6.1)
+    webdrivers (4.7.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
+      selenium-webdriver (> 3.141, < 5.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -593,7 +596,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zaru (0.3.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby

diff --git a/app/controllers/alternate_values_controller.rb b/app/controllers/alternate_values_controller.rb
@@ -47,7 +47,7 @@ def update
       @alternate_value.project_id = sessions_current_project_id if params[:project_members_only] == 'checked'
       if @alternate_value.update(alternate_value_params)
         format.html { redirect_to url_for(@alternate_value.alternate_value_object.metamorphosize), notice: 'Alternate value was successfully updated.' }
-        format.json { render json: @alternate_value, status: :ok, location: @alternate_value.metamorphosize }
+        format.json { render action: :show, status: :ok, location: @alternate_value.metamorphosize }
       else
         format.html { redirect_back(fallback_location: (request.referer || root_path), notice: 'Alternate value was NOT successfully updated.')}
         format.json { render json: @alternate_value.errors, status: :unprocessable_entity }

diff --git a/app/helpers/taxon_name_relationships_helper.rb b/app/helpers/taxon_name_relationships_helper.rb
@@ -36,7 +36,7 @@ def taxon_name_relationship_for_object_tag(taxon_name_relationship)
   def type_taxon_name_relationship_tag(taxon_name_relationship, target: :browse_nomenclature_task_path)
     return nil if taxon_name_relationship.nil?
     # TODO: add original citation to relationship rendering
-    content_tag(:span, [ taxon_name_relationship.subject_status.capitalize,
+    content_tag(:span, [ taxon_name_relationship.subject_status,
                          link_to( original_taxon_name_tag( taxon_name_relationship.subject_taxon_name), send(target, taxon_name_id: taxon_name_relationship.subject_taxon_name.id)),
                          original_author_year(taxon_name_relationship.subject_taxon_name)].join(' ').html_safe, class: 'type_information'
                )