Merge pull request #279 from UN-OCHA/berliner/HPC-9927

HPC-9927: Fix handling of column setting on paragraphs

html/modules/custom/ncms_ui/ncms_ui.module

@@ -35,6 +35,7 @@ use Drupal\ncms_ui\Entity\Media\Video;
 use Drupal\ncms_ui\Entity\Taxonomy\ContentSpace;
 use Drupal\ncms_ui\Form\ContentSpaceSelectForm;
 use Drupal\node\NodeInterface;
+use Drupal\paragraphs\Entity\Paragraph;
 use Drupal\user\Entity\User;
 use Drupal\views\Plugin\views\cache\CachePluginBase;
 use Drupal\views\Plugin\views\query\QueryPluginBase;
@@ -299,6 +300,24 @@ function ncms_ui_preprocess_node(&$variables) {
   }
 }
 
+/**
+ * Implements hook_preprocess_hook().
+ */
+function ncms_ui_preprocess_field(&$variables) {
+  /** @var \Drupal\Core\Entity\EntityInterface $entity */
+  $entity = $variables['element']['#object'];
+  if ($entity instanceof Paragraph) {
+    if ($entity->hasField('field_columns')) {
+      $columns_field = $entity->get('field_columns');
+      if ($columns_field->isEmpty()) {
+        $columns_field->applyDefaultValue();
+      }
+      $columns = $columns_field->value;
+      $variables['attributes']['class'][] = 'col-' . $columns;
+    }
+  }
+}
+
 /**
  * Implements hook_preprocess_hook().
  */
@@ -315,22 +334,6 @@ function ncms_ui_preprocess_field__paragraph__field_title__document_chapter(&$va
   }
 }
 
-/**
- * Implements hook_preprocess_hook().
- */
-function ncms_ui_preprocess_field__paragraph(&$variables, $original_hook) {
-  /** @var \Drupal\paragraphs\Entity\Paragraph $paragraph */
-  $paragraph = $variables['element']['#object'];
-  if ($paragraph->hasField('field_columns')) {
-    $columns_field = $paragraph->get('field_columns');
-    if ($columns_field->isEmpty()) {
-      $columns_field->applyDefaultValue();
-    }
-    $columns = $columns_field->value;
-    $variables['attributes']['class'][] = 'col-' . $columns;
-  }
-}
-
 /**
  * Implements hook_preprocess_layout_paragraphs_builder_controls().
  */