X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Finline_entity_form%2Fsrc%2FElement%2FInlineEntityForm.php;h=0fbe2335ab249b9a568b0d0cb3ef66d305777213;hp=b55f7812c852cb6fcdc4f01cd4355f36a0f3798f;hb=059867c3f96750652c80f39e44c442a58c2549ee;hpb=f8fc16ae6b862bef59baaad5d051dd37b7ff11b2

diff --git a/web/modules/contrib/inline_entity_form/src/Element/InlineEntityForm.php b/web/modules/contrib/inline_entity_form/src/Element/InlineEntityForm.php
index b55f7812c..0fbe2335a 100644
--- a/web/modules/contrib/inline_entity_form/src/Element/InlineEntityForm.php
+++ b/web/modules/contrib/inline_entity_form/src/Element/InlineEntityForm.php
@@ -47,9 +47,14 @@ class InlineEntityForm extends RenderElement {
       '#form_mode' => 'default',
       // Will save entity on submit if set to TRUE.
       '#save_entity' => TRUE,
-      // 'add' or 'edit'. If NULL, determined by whether the entity is new.
+      // 'add', 'edit' or 'duplicate'.
       '#op' => NULL,
       '#process' => [
+        // Core's #process for groups, don't remove it.
+        [$class, 'processGroup'],
+
+        // InlineEntityForm's #process must run after the above ::processGroup
+        // in case any new elements (like groups) were added in alter hooks.
         [$class, 'processEntityForm'],
       ],
       '#element_validate' => [
@@ -59,9 +64,10 @@ class InlineEntityForm extends RenderElement {
         [$class, 'submitEntityForm'],
       ],
       '#theme_wrappers' => ['container'],
-      // Allow inline forms to use the #fieldset key.
+
       '#pre_render' => [
-        [$class, 'addFieldsetMarkup'],
+        // Core's #pre_render for groups, don't remove it.
+        [$class, 'preRenderGroup'],
       ],
     ];
   }
@@ -114,7 +120,13 @@ class InlineEntityForm extends RenderElement {
       $entity_form['#entity'] = $storage->create($values);
     }
     if (!isset($entity_form['#op'])) {
-      $entity_form['#op'] = $entity_form['#entity']->isNew() ? 'add' : 'edit';
+      // When duplicating entities, the entity is new, but already has a UUID.
+      if ($entity_form['#entity']->isNew() && $entity_form['#entity']->uuid()) {
+        $entity_form['#op'] = 'duplicate';
+      }
+      else {
+        $entity_form['#op'] = $entity_form['#entity']->isNew() ? 'add' : 'edit';
+      }
     }
     // Prepare the entity form and the entity itself for translating.
     $entity_form['#entity'] = TranslationHelper::prepareEntity($entity_form['#entity'], $form_state);
@@ -179,42 +191,4 @@ class InlineEntityForm extends RenderElement {
     return $inline_form_handler;
   }
 
-  /**
-   * Pre-render callback for the #fieldset form property.
-   *
-   * Inline forms use #tree = TRUE to keep their values in a hierarchy for
-   * easier storage. Moving the form elements into fieldsets during form
-   * building would break up that hierarchy, so it's not an option for entity
-   * fields. Therefore, we wait until the pre_render stage, where any changes
-   * we make affect presentation only and aren't reflected in $form_state.
-   *
-   * @param array $entity_form
-   *   The entity form.
-   *
-   * @return array
-   *   The modified entity form.
-   */
-  public static function addFieldsetMarkup($entity_form) {
-    $sort = [];
-    foreach (Element::children($entity_form) as $key) {
-      $element = $entity_form[$key];
-      if (isset($element['#fieldset']) && isset($entity_form[$element['#fieldset']])) {
-        $entity_form[$element['#fieldset']][$key] = $element;
-        // Remove the original element this duplicates.
-        unset($entity_form[$key]);
-        // Mark the fieldset for sorting.
-        if (!in_array($key, $sort)) {
-          $sort[] = $element['#fieldset'];
-        }
-      }
-    }
-
-    // Sort all fieldsets, so that element #weight stays respected.
-    foreach ($sort as $key) {
-      uasort($entity_form[$key], '\Drupal\Component\Utility\SortArray::sortByWeightProperty');
-    }
-
-    return $entity_form;
-  }
-
 }