Merge branch 'hotfix-sample_update'

Indicia-Team · Apr 3, 2020 · 9bb8987 · 9bb8987
2 parents e9062f1 + 2b011e3
commit 9bb8987
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -29,14 +29,14 @@
  *
  * @var string
  */
-$config['version'] = '3.2.1';
+$config['version'] = '3.2.2';
 
 /**
  * Version release date.
  *
  * @var string
  */
-$config['release_date'] = '2020-03-30';
+$config['release_date'] = '2020-04-03';
 
 /**
  * Link to the code repository downloads page.

diff --git a/application/models/occurrence.php b/application/models/occurrence.php
@@ -129,6 +129,7 @@ public function validate(Validation $array, $save = FALSE) {
       $metadataFieldChanging = !empty($fields['metadata']) && $fields['metadata']['value'] !== $this->metadata;
       $identChanging = !empty($fields['taxa_taxon_list_id']) && $fields['taxa_taxon_list_id']['value'] !== $this->metadata;
       $isAlreadyReviewed = preg_match('/[RDV]/', $this->record_status) || $this->record_substatus === 3;
+      $sampleUpdating = $this->sample && $this->sample->wantToUpdateMetadata;
       // Is this post going to change the record status or substatus?
       if ($newStatus !== $this->record_status || $newSubstatus !== $this->record_substatus) {
         if ($newStatus === 'V' || $newStatus === 'R') {
@@ -143,7 +144,7 @@ public function validate(Validation $array, $save = FALSE) {
           $array->verified_on = NULL;
         }
       }
-      elseif ($this->wantToUpdateMetadata && $isAlreadyReviewed) {
+      elseif (($sampleUpdating || $this->wantToUpdateMetadata) && $isAlreadyReviewed) {
         // We are making a change to a previously reviewed record that doesn't
         // explicitly set the status. If the change is to the release status
         // or occurrence metadata field, then we don't do anything, otherwise