Merge changes from develop.

modules/tide_site_restriction/src/Plugin/views/field/TideNodeBulkForm.php

@@ -74,6 +74,17 @@ public function viewsForm(&$form, FormStateInterface $form_state) {
         '#empty_option' => $this->t('- Select -'),
       ];
       $current_user = \Drupal::currentUser();
+
+      // Removed delete option for approver role.
+      if ($current_user) {
+        $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']);
+        }
+      }
       if (!$current_user->hasPermission('tide node bulk update') &&
           !\Drupal::service('tide_site_restriction.helper')->canBypassRestriction($current_user)) {
         $form['actions']['submit']['#disabled'] = TRUE;
@@ -86,15 +97,6 @@ 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']);
-    }
   }
 
 }