Rw 1058 round 3

html/modules/custom/reliefweb_entities/src/Entity/Report.php

@@ -242,8 +242,15 @@ public function preSave(EntityStorageInterface $storage) {
       }
     }
 
+    // Update the entity status based on the user posting rights.
+    $this->updateModerationStatusFromPostingRights();
+
     // Change the status to `embargoed` if there is an embargo date.
-    if (!empty($this->field_embargo_date->value) && $this->getModerationStatus() !== 'draft') {
+    if (!empty($this->field_embargo_date->value) && !in_array($this->getModerationStatus(), [
+      'draft',
+      'pending',
+      'refused',
+    ])) {
       $this->setModerationStatus('embargoed');
 
       $message = strtr('Embargoed (to be automatically published on @date).', [
@@ -258,9 +265,6 @@ public function preSave(EntityStorageInterface $storage) {
     // Prepare notifications.
     $this->preparePublicationNotification();
 
-    // Update the entity status based on the user posting rights.
-    $this->updateModerationStatusFromPostingRights();
-
     // Update the entity status based on the source(s) moderation status.
     $this->updateModerationStatusFromSourceStatus();
 

html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php

@@ -465,7 +465,6 @@ protected function alterFieldsForContributors(array &$form, FormStateInterface $
     // Hide fields.
     $form['field_bury']['#access'] = FALSE;
     $form['field_feature']['#access'] = FALSE;
-    $form['field_notify']['#access'] = FALSE;
 
     $form['field_headline']['#access'] = FALSE;
     $form['field_headline_title']['#access'] = FALSE;