diff --git a/CHANGELOG.md b/CHANGELOG.md index c5e8f4ae7e..fa8523e493 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,23 @@ This project does not yet adheres to [Semantic Versioning](https://semv \- +## [0.22.2] - 2021-12-02 + +### Changed +- Upped from 40 to 500 the cutoff point at which updating a collecing event will trigger a DwcOccurrence rebuild +- Added a `url_base` option when rendering metadata partial + +### Fixed +- Author by first letter (/people.json) [2697] +- Loan recipient helper methods were confused with loan helper methods +- Subsequent combination link in new taxon name task [#2695] +- Unable to create tags in batches due to Ruby 3 syntax changes. +- Observation matrices crashing due to response pagination bug. +- Unable to create namespaces due to debug code accidentally added. + +[#2697]: https://github.com/SpeciesFileGroup/taxonworks/issues/2697 +[#2695]: https://github.com/SpeciesFileGroup/taxonworks/issues/2695 + ## [0.22.1] - 2021-12-01 ### Added @@ -2109,7 +2126,8 @@ This project does not yet adheres to [Semantic Versioning](https://semv [#1532]: https://github.com/SpeciesFileGroup/taxonworks/issues/1532 -[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.1...development +[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.2...development +[0.22.2]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.1...v0.22.2 [0.22.1]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.0...v0.22.1 [0.22.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.21.3...v0.22.0 [0.21.3]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.21.2...v0.21.3 diff --git a/app/controllers/namespaces_controller.rb b/app/controllers/namespaces_controller.rb index d841380bd0..17c7b2b736 100644 --- a/app/controllers/namespaces_controller.rb +++ b/app/controllers/namespaces_controller.rb @@ -36,7 +36,6 @@ def edit # POST /namespaces # POST /namespaces.json def create - byebug @namespace = Namespace.new(namespace_params) respond_to do |format| diff --git a/app/controllers/observation_matrices_controller.rb b/app/controllers/observation_matrices_controller.rb index d666ce7204..6b9a262b1a 100644 --- a/app/controllers/observation_matrices_controller.rb +++ b/app/controllers/observation_matrices_controller.rb @@ -13,7 +13,7 @@ def index render '/shared/data/all/index' end format.json { - @observation_matrices = ObservationMatrix.where(project_id: sessions_current_project_id) + @observation_matrices = ObservationMatrix.where(project_id: sessions_current_project_id).page(params[:page]).per(params[:per]) } end end @@ -24,7 +24,7 @@ def show end def list - @observation_matrices = ObservationMatrix.with_project_id(sessions_current_project_id).page(params[:page]) + @observation_matrices = ObservationMatrix.with_project_id(sessions_current_project_id).page(params[:page]).per(params[:per]) end # GET /observation_matrices/new diff --git a/app/controllers/sequences_controller.rb b/app/controllers/sequences_controller.rb index 09eda7588e..b40eb1db84 100644 --- a/app/controllers/sequences_controller.rb +++ b/app/controllers/sequences_controller.rb @@ -3,11 +3,16 @@ class SequencesController < ApplicationController before_action :set_sequence, only: [:show, :edit, :update, :destroy] - # GET /sequences - # GET /sequences.json def index - @recent_objects = Sequence.recent_from_project_id(sessions_current_project_id).order(updated_at: :desc).limit(10) - render '/shared/data/all/index' + respond_to do |format| + format.html do + @recent_objects = Sequence.recent_from_project_id(sessions_current_project_id).order(updated_at: :desc).limit(10) + render '/shared/data/all/index' + end + format.json { + @sequences = Sequence.where(project_id: sessions_current_project_id).page(params[:page]).per(params[:per] || 500) + } + end end # GET /sequences/1 diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 57576fbe4f..35a868c158 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -114,7 +114,7 @@ def batch_remove # POST /tags/batch_create.json?keyword_id=123&object_type=CollectionObject&object_ids[]=123 def batch_create if Tag.batch_create( - params.permit(:keyword_id, :object_type, object_ids: []).to_h.merge(user_id: sessions_current_user_id, project_id: sessions_current_project_id).symbolize_keys + **params.permit(:keyword_id, :object_type, object_ids: []).to_h.merge(user_id: sessions_current_user_id, project_id: sessions_current_project_id).symbolize_keys ) render json: {success: true} else diff --git a/app/helpers/loan_recipients_helper.rb b/app/helpers/loan_recipients_helper.rb index 5c6af38204..54239353ae 100644 --- a/app/helpers/loan_recipients_helper.rb +++ b/app/helpers/loan_recipients_helper.rb @@ -1,9 +1,8 @@ module LoanRecipientsHelper - def loan_recipient_tag(loan) - return nil if loan.nil? - recipients = loan.loan_recipients.collect{|lr| person_tag(lr)}.join.html_safe - recipients.blank? ? 'No recipients defined!' : recipients + def loan_recipient_tag(loan_recipient) + return nil if loan_recipient.nil? + person_tag(loan_recipient.person) end def loan_recipient_link(loan) diff --git a/app/helpers/loans_helper.rb b/app/helpers/loans_helper.rb index a27b187d53..6a69c50f93 100644 --- a/app/helpers/loans_helper.rb +++ b/app/helpers/loans_helper.rb @@ -13,7 +13,12 @@ def loan_tag(loan) def label_for_loan(loan) s = "loan #{loan.id}" s << loan.identifiers&.pluck(:cached)&.join(', ') + end + def loan_recipients_tag(loan) + return nil if loan.nil? + recipients = loan.loan_recipients.collect{|lr| person_tag(lr)}.join.html_safe + recipients.blank? ? 'No recipients defined!' : recipients end def loan_autocomplete_tag(loan) diff --git a/app/helpers/workbench/object_helper.rb b/app/helpers/workbench/object_helper.rb index 30175339c0..a07f72b219 100644 --- a/app/helpers/workbench/object_helper.rb +++ b/app/helpers/workbench/object_helper.rb @@ -1,9 +1,8 @@ - # A metamodule- helper methods for object related manipulations in other helpers module Workbench::ObjectHelper # @return [ActiveRecord object] - # metamorphosize is defined in the conern Shared::IsData, if its available use it on the object + # metamorphosize is defined in the concern Shared::IsData, if its available use it on the object def metamorphosize_if(object) if object.respond_to?(:metamorphosize) object.metamorphosize @@ -11,7 +10,7 @@ def metamorphosize_if(object) object end end - + # @return [String] # the member path base for the object, object should be metamorphosized before passing. def member_base_path(object) @@ -29,5 +28,4 @@ def helper_module(object) (object.class.name + 'Helper').constantize end - end diff --git a/app/javascript/vue/components/radials/annotator/images/attribution.js b/app/javascript/vue/components/radials/annotator/images/attribution.js index 8441257a23..2a3fca0a8f 100644 --- a/app/javascript/vue/components/radials/annotator/images/attribution.js +++ b/app/javascript/vue/components/radials/annotator/images/attribution.js @@ -1 +1 @@ -export default 'data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTguMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDM2Ny40NjcgMzY3LjQ2NyIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzY3LjQ2NyAzNjcuNDY3OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgd2lkdGg9IjE2cHgiIGhlaWdodD0iMTZweCI+CjxnPgoJPHBhdGggZD0iTTE4My43MywwLjAxOEM4Mi40MjcsMC4wMTgsMCw4Mi40MDQsMCwxODMuNzMzYzAsMTAxLjI4OSw4Mi40MjcsMTgzLjcxNiwxODMuNzMsMTgzLjcxNiAgIGMxMDEuMzE1LDAsMTgzLjczNy04Mi40MjcsMTgzLjczNy0xODMuNzE2QzM2Ny40NjcsODIuNDA0LDI4NS4wNDUsMC4wMTgsMTgzLjczLDAuMDE4eiBNMTgzLjczLDMyNi41MTggICBjLTc4Ljc0MywwLTE0Mi43OTgtNjQuMDUyLTE0Mi43OTgtMTQyLjc4NGMwLTc4Ljc2Niw2NC4wNTUtMTQyLjgxNywxNDIuNzk4LTE0Mi44MTdjNzguNzUyLDAsMTQyLjgwNyw2NC4wNTIsMTQyLjgwNywxNDIuODE3ICAgQzMyNi41MzYsMjYyLjQ2NiwyNjIuNDgxLDMyNi41MTgsMTgzLjczLDMyNi41MTh6IiBmaWxsPSIjNDQ0NDQ0Ii8+Cgk8cGF0aCBkPSJNMjQ0LjAzNiwyMTcuMDE0Yy0xMS43MzcsMjAuMTQxLTMzLjU2MiwzMi42MzUtNTYuOTU2LDMyLjYzNWMtMzYuMzI5LDAtNjUuOTIxLTI5LjU4NS02NS45MjEtNjUuOTE1ICAgYzAtMzYuMzYsMjkuNTkyLTY1Ljk1NSw2NS45MjEtNjUuOTU1YzIzLjM5NSwwLDQ1LjIxOSwxMi41NCw1Ni45NTYsMzIuNjQxbDEuNTE3LDIuNjI3aDQ0LjI4bC0yLjY1OC03LjEyOSAgIGMtNy43MDUtMjAuNDEzLTIxLjIyNS0zNy43NjktMzkuMTIyLTUwLjE1N2MtMTcuOTQyLTEyLjQyLTM5LjAxNy0xOS4wMDktNjAuOTczLTE5LjAwOWMtNTguOTgxLDAtMTA2Ljk0Niw0OC4wMDYtMTA2Ljk0NiwxMDYuOTgyICAgYzAsNTguOTgsNDcuOTY1LDEwNi45NDEsMTA2Ljk0NiwxMDYuOTQxYzIxLjk1NiwwLDQzLjAzLTYuNTY3LDYwLjk3My0xOS4wMDZjMTcuODk3LTEyLjM5MSwzMS40MTctMjkuNzQxLDM5LjEyMi01MC4xNTQgICBsMi42NTgtNy4xMzNoLTQ0LjI4TDI0NC4wMzYsMjE3LjAxNHoiIGZpbGw9IiM0NDQ0NDQiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K' \ No newline at end of file +export default 'data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTguMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDM2Ny40NjcgMzY3LjQ2NyIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzY3LjQ2NyAzNjcuNDY3OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgd2lkdGg9IjE2cHgiIGhlaWdodD0iMTZweCI+CjxnPgoJPHBhdGggZD0iTTE4My43MywwLjAxOEM4Mi40MjcsMC4wMTgsMCw4Mi40MDQsMCwxODMuNzMzYzAsMTAxLjI4OSw4Mi40MjcsMTgzLjcxNiwxODMuNzMsMTgzLjcxNiAgIGMxMDEuMzE1LDAsMTgzLjczNy04Mi40MjcsMTgzLjczNy0xODMuNzE2QzM2Ny40NjcsODIuNDA0LDI4NS4wNDUsMC4wMTgsMTgzLjczLDAuMDE4eiBNMTgzLjczLDMyNi41MTggICBjLTc4Ljc0MywwLTE0Mi43OTgtNjQuMDUyLTE0Mi43OTgtMTQyLjc4NGMwLTc4Ljc2Niw2NC4wNTUtMTQyLjgxNywxNDIuNzk4LTE0Mi44MTdjNzguNzUyLDAsMTQyLjgwNyw2NC4wNTIsMTQyLjgwNywxNDIuODE3ICAgQzMyNi41MzYsMjYyLjQ2NiwyNjIuNDgxLDMyNi41MTgsMTgzLjczLDMyNi41MTh6IiBmaWxsPSIjNDQ0NDQ0Ii8+Cgk8cGF0aCBkPSJNMjQ0LjAzNiwyMTcuMDE0Yy0xMS43MzcsMjAuMTQxLTMzLjU2MiwzMi42MzUtNTYuOTU2LDMyLjYzNWMtMzYuMzI5LDAtNjUuOTIxLTI5LjU4NS02NS45MjEtNjUuOTE1ICAgYzAtMzYuMzYsMjkuNTkyLTY1Ljk1NSw2NS45MjEtNjUuOTU1YzIzLjM5NSwwLDQ1LjIxOSwxMi41NCw1Ni45NTYsMzIuNjQxbDEuNTE3LDIuNjI3aDQ0LjI4bC0yLjY1OC03LjEyOSAgIGMtNy43MDUtMjAuNDEzLTIxLjIyNS0zNy43NjktMzkuMTIyLTUwLjE1N2MtMTcuOTQyLTEyLjQyLTM5LjAxNy0xOS4wMDktNjAuOTczLTE5LjAwOWMtNTguOTgxLDAtMTA2Ljk0Niw0OC4wMDYtMTA2Ljk0NiwxMDYuOTgyICAgYzAsNTguOTgsNDcuOTY1LDEwNi45NDEsMTA2Ljk0NiwxMDYuOTQxYzIxLjk1NiwwLDQzLjAzLTYuNTY3LDYwLjk3My0xOS4wMDZjMTcuODk3LTEyLjM5MSwzMS40MTctMjkuNzQxLDM5LjEyMi01MC4xNTQgICBsMi42NTgtNy4xMzNoLTQ0LjI4TDI0NC4wMzYsMjE3LjAxNHoiIGZpbGw9IiM0NDQ0NDQiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K' diff --git a/app/javascript/vue/components/radials/annotator/images/icons.js b/app/javascript/vue/components/radials/annotator/images/icons.js index 717038c86e..133e45393b 100644 --- a/app/javascript/vue/components/radials/annotator/images/icons.js +++ b/app/javascript/vue/components/radials/annotator/images/icons.js @@ -10,6 +10,7 @@ import notes from './book' import tags from './tag' import attribution from './attribution' import pin from './pin' +import verifiers from './verifier' const Icons = { alternate_values, @@ -23,7 +24,8 @@ const Icons = { tags, protocol_relationships, attribution, - pin + pin, + verifiers } export default Icons diff --git a/app/javascript/vue/components/radials/annotator/images/verifier.js b/app/javascript/vue/components/radials/annotator/images/verifier.js new file mode 100644 index 0000000000..89192632d2 --- /dev/null +++ b/app/javascript/vue/components/radials/annotator/images/verifier.js @@ -0,0 +1 @@ +export default 'data:image/svg+xml;utf8;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="113.75977mm"
   height="103.90096mm"
   viewBox="0 0 113.75977 103.90096"
   version="1.1"
   id="svg932"
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
   sodipodi:docname="verifier.svg">
  <defs
     id="defs926" />
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="3.959798"
     inkscape:cx="89.562638"
     inkscape:cy="138.3307"
     inkscape:document-units="mm"
     inkscape:current-layer="layer1"
     showgrid="false"
     inkscape:window-width="5120"
     inkscape:window-height="2806"
     inkscape:window-x="0"
     inkscape:window-y="0"
     inkscape:window-maximized="1"
     fit-margin-top="0"
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0" />
  <metadata
     id="metadata929">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Capa 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(-0.26714958,-0.25064851)">
    <path
       style="fill:#000000;stroke-width:0.26458332"
       d="m 49.892233,103.66555 c -2.24955,-0.66096 -3.32279,-1.15909 -5.10523,-2.36952 -1.59246,-1.08141 -3.88595,-3.420556 -4.3507,-4.437305 -0.18908,-0.41366 -0.56777,-0.59902 -1.42008,-0.69508 -1.37005,-0.15443 -1.90622,-0.54165 -2.4062,-1.73776 -0.3267,-0.78158 -0.31469,-0.98897 0.10713,-1.84999 0.57556,-1.17483 1.40903,-1.6282 2.98862,-1.62566 1.63597,0.003 3.18624,0.77214 4.25815,2.11364 3.04402,3.8096 5.07398,5.248279 8.21511,5.822269 0.97386,0.17794 9.71439,0.24697 25.13542,0.19849 l 23.642377,-0.0743 1.27335,-0.74848 c 3.51582,-2.066589 3.64807,-6.851789 0.25364,-9.177699 -0.80916,-0.55444 -1.34446,-0.66487 -3.843857,-0.79292 -2.86101,-0.14659 -2.915,-0.16136 -3.66689,-1.00287 -0.41972,-0.46975 -0.76313,-1.15578 -0.76313,-1.5245 0,-0.87089 0.64634,-2.10817 1.24698,-2.38709 0.26005,-0.12075 2.21917,-0.28401 4.35361,-0.36279 3.780157,-0.13952 3.910517,-0.16391 5.027087,-0.94051 1.43249,-0.99636 2.33691,-2.69959 2.33691,-4.40094 0,-1.60525 -0.35695,-2.52519 -1.40529,-3.62174 -1.36748,-1.43039 -2.15271,-1.70727 -5.20929,-1.83683 -2.537097,-0.10756 -2.841257,-0.17691 -3.505737,-0.79927 -0.57136,-0.53514 -0.7276,-0.92148 -0.7276,-1.79909 0,-0.92317 0.14162,-1.23677 0.81405,-1.80258 0.76918,-0.64722 0.97697,-0.68505 3.770317,-0.68646 3.70944,-0.002 4.77548,-0.2929 6.16608,-1.6835 2.14915,-2.14916 2.21098,-5.21204 0.14958,-7.41036 -1.18012,-1.25851 -2.55698,-1.74022 -4.99274,-1.74677 -1.92223,-0.005 -2.250817,-0.0801 -2.957127,-0.67441 -1.00551,-0.84609 -1.26627,-1.94285 -0.71525,-3.00841 0.57346,-1.10893 0.98133,-1.26238 3.757287,-1.41343 1.88507,-0.10257 2.67238,-0.27104 3.56012,-0.76177 1.54018,-0.85139 2.58658,-2.39883 2.79137,-4.12794 0.21952,-1.85353 -0.7875,-4.00604 -2.36184,-5.04843 l -1.07854,-0.71411 -12.587597,-0.1323 -12.58759,-0.13229 -1.50155,-0.7039 c -2.12184,-0.99468 -3.70798,-2.55417 -4.59956,-4.52229 l -0.74882,-1.65297 -0.20818,-10.18646 c -0.24282,-11.88087 -0.37731,-12.70125 -2.46235,-15.0203202 -1.7763,-1.97568 -3.10033,-2.50427 -6.61912,-2.64256 -1.75733,-0.0691 -3.20458,3e-5 -3.65289,0.1744 l -0.74248,0.28877 0.17006,4.8295402 c 0.0935,2.65625 0.0507,6.67501 -0.0951,8.93059 -0.43429,6.717 -1.35451,8.72042 -5.22578,11.37708 -5.8249,3.99735 -8.80991,7.83922 -11.24141,14.46833 -1.38244,3.76897 -3.14507,6.35877 -5.3675,7.88634 l -1.54019,1.05864 -3.01393,0.0957 -3.01393,0.0957 -0.0718,23.14445 -0.0718,23.144425 -0.86407,0.77197 -0.86407,0.77197 h -13.03381 c -14.46021054,0 -13.8760005,0.07 -14.63828054,-1.75437 l -0.37248,-0.891446 c -0.037,-22.605989 0.0442,-24.456639 0.2825,-54.248509 0.39093,-2.40655 0.17839,-2.37233 14.73121054,-2.37185 11.25417,2.6e-4 12.46183,0.0424 13.30381,0.46302 1.12595,0.56248 1.55151,1.63635 1.57257,3.96834 l 0.0149,1.65365 2.3151,-0.006 c 1.79705,-0.005 2.4391,-0.10817 2.86924,-0.46302 1.11195,-0.91729 1.97668,-2.41334 3.01905,-5.22317 2.69333,-7.26022 6.74339,-12.56348 12.54127,-16.4219 1.92309,-1.27978 2.3153,-1.67252 2.8445,-2.84827 0.5961,-1.3244 0.61774,-1.64017 0.74931,-10.93103 l 0.13548,-9.5672402 0.82197,-1.01491 c 0.45207,-0.5582 1.34504,-1.28053 1.98437,-1.60517 3.15575,-1.60246002 9.52617,-1.37402002 13.39782,0.48043 1.77881,0.85202 4.55847,3.72191 5.56042,5.74093 1.42506,2.8716202 1.61903,4.4840602 1.85261,15.4009102 0.23486,10.97658 0.17321,10.62205 2.03243,11.68785 l 1.0733,0.61526 11.27912,-0.0915 c 8.045097,-0.0653 11.724467,-8e-4 12.832297,0.22521 3.32314,0.67765 6.30791,3.00663 7.72324,6.02631 0.628,1.33987 0.7091,1.83065 0.7091,4.29103 0,2.44876 -0.0827,2.95441 -0.69722,4.26509 -0.38348,0.81782 -1.13838,1.97527 -1.67758,2.5721 l -0.98036,1.08512 0.94279,1.15056 c 3.70262,4.51856 3.26992,11.24558 -0.95599,14.86281 l -1.05572,0.90366 0.56695,0.79621 c 1.75665,2.46699 2.49971,5.84485 1.8756,8.52623 -0.48818,2.09736 -1.79559,4.38691 -3.19187,5.58964 l -1.22956,1.05912 0.88697,1.31804 c 1.96034,2.91305 2.25053,7.0608 0.71774,10.258919 -0.90237,1.88278 -2.5176,3.657156 -4.26003,4.679816 -2.42587,1.42376 -1.94561,1.40055 -28.644857,1.38359 -22.82485,-0.0145 -24.86134,-0.0518 -26.32604,-0.48213 z m -25.06789,-30.650535 0.0675,-24.40781 h -9.65866 -9.6586705 v 24.29755 c 0,13.36367 0.0809,24.37843 0.17968,24.47726 0.0988,0.0988 4.4148395,0.14843 9.5911405,0.11024 l 9.41147,-0.0694 z"
       id="path839"
       inkscape:connector-curvature="0"
       sodipodi:nodetypes="cccccccccccccccscscscscscccccsccccccccsccsscccccccccccccccsccccscccccccscccccsccccsscccsscscsccccsccccccscccc" />
  </g>
</svg>
' diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/Combination/CombinationMain.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/Combination/CombinationMain.vue index 8343b4659b..266cecb326 100644 --- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/Combination/CombinationMain.vue +++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/Combination/CombinationMain.vue @@ -1,7 +1,7 @@