Merge branch 'develop' into feat/198/quote-for-new-download

unepwcmc · Oct 4, 2023 · 60aad73 · 60aad73
2 parents 8fb7f97 + 75c92b9
commit 60aad73
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/README.rdoc b/README.rdoc
@@ -1,4 +1,7 @@
 = Species+ 
+
+NOTE: There is a separate {public API application}[https://github.com/unepwcmc/species-api] for Species+
+
 {<img src="https://secure.travis-ci.org/unepwcmc/SAPI.png" />}[http://travis-ci.org/unepwcmc/SAPI] 
 {<img src="https://codeclimate.com/github/unepwcmc/SAPI.png" />}[https://codeclimate.com/github/unepwcmc/SAPI] 
 {<img src="https://coveralls.io/repos/unepwcmc/SAPI/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/unepwcmc/SAPI?branch=master]

diff --git a/app/assets/javascripts/species/templates/taxon_concept/_eu_decisions.handlebars b/app/assets/javascripts/species/templates/taxon_concept/_eu_decisions.handlebars
@@ -69,6 +69,10 @@
                 <a class="legal-links" href="https://speciesplus.net/api/v1/documents/{{unbound decision.intersessional_decision_id}}">
                   Intersessional decision
                 </a>
+              {{else}}
+               {{#unless decision.start_event.name }}
+                Intersessional decision
+               {{/unless}}
               {{/if}}
               {{#if decision.private_url}}
                 <a class="legal-links" href="{{unbound decision.private_url}}">
@@ -164,6 +168,10 @@
                     <a class="legal-links" href="https://speciesplus.net/api/v1/documents/{{unbound decision.intersessional_decision_id}}">
                       Intersessional decision
                     </a>
+                  {{else}}
+                   {{#unless decision.start_event.name }}
+                    Intersessional decision
+                   {{/unless}}
                   {{/if}}
                   {{#if decision.private_url}}
                     <a class="legal-links" href="{{unbound decision.private_url}}">

diff --git a/app/models/eu_opinion.rb b/app/models/eu_opinion.rb
@@ -35,7 +35,7 @@ class EuOpinion < EuDecision
   validate :event_or_document_presence
 
   def event_or_document_presence
-    return if start_event_id.nil? ^ document_id.nil?
-    errors.add(:base, "Select at least an Event or a Document, but not both")
+    return unless start_event_id.present? && document_id.present?
+    errors.add(:base, "Select at an Event, a Document or neither, but not both")
   end
 end
diff --git a/app/views/layouts/pages.html.erb b/app/views/layouts/pages.html.erb
@@ -62,7 +62,8 @@
               <li><a href="http://api.speciesplus.net">Species+ / CITES Checklist API</a></li>
               <li><a href="http://captivebreeding.unep-wcmc.org">EU Captive breeding database</a></li>
               <li><a href="/eu_legislation">EU Wildlife Trade Legislation</a></li>
-              <li><a href="http://euanalysis.unep-wcmc.org/">EU analysis</a></li>
+              <li><a href="https://ec.europa.eu/environment/cites/reports_en.htm">EU analysis</a></li>
+              <li><a href="https://tradeview.cites.org/">CITES Wildlife TradeView</a></li>
             </ul>
           </div>
           </li>