Merge branch 'release/5.0.0'

dpc-sdp · Oct 14, 2024 · 3bab093 · 3bab093
2 parents ca4a58e + 146182a
commit 3bab093
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/modules/tide_landing_page/src/Helper/TideLandingPageHelper.php b/modules/tide_landing_page/src/Helper/TideLandingPageHelper.php
@@ -26,9 +26,8 @@ public static function localDateAndTimeFormatter($date) {
       $drupal_date_time = new DrupalDateTime($date, $storage_tz);
       // Convert to local timezone.
       $system_tz = \Drupal::service('config.factory')->get('system.date')->get('timezone.default');
-      $date_formatter = \Drupal::service('date.formatter');
-      $converted_date = $date_formatter->format($drupal_date_time->getTimeStamp(), 'custom', 'Y-m-d H:i:s', $system_tz);
-      return $converted_date;
+      $drupal_date_time->setTimezone(new \DateTimeZone($system_tz));
+      return $drupal_date_time->format(\DateTime::ATOM);
     }
   }
 

diff --git a/modules/tide_site_restriction/src/Plugin/views/field/TideNodeBulkForm.php b/modules/tide_site_restriction/src/Plugin/views/field/TideNodeBulkForm.php
@@ -86,6 +86,15 @@ public function viewsForm(&$form, FormStateInterface $form_state) {
       // Remove the default actions build array.
       unset($form['actions']);
     }
+
+    // Removed delete option for approver role.
+    $roles = $current_user->getRoles();
+    if (
+      in_array('approver', $roles) &&
+      isset($form['header']['node_bulk_form']['action']['#options']['node_delete_action'])
+    ) {
+      unset($form['header']['node_bulk_form']['action']['#options']['node_delete_action']);
+    }
   }
 
 }