Merge branch 'release-1.12.0'

unepwcmc · Sep 14, 2023 · 5787a32 · 5787a32
2 parents 9c6487f + 006186a
commit 5787a32
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.12.0
+* Allow intersessional decisions to be created without start events or documents
+
 ### 1.11.0
 * Adds accepted names to serializer to match documented end point
 * Adds diactric insensitive seraching to geo_entity_search

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