Commit bb44c98e authored by drdam's avatar drdam
Browse files

fix #3282550 : separate UUID of each field on text+sumary

parent d8d5a9db

src/Plugin/Field/FieldWidget/BaseCplxTrait.php

+4 −2
Original line number Diff line number Diff line
@@ -282,8 +282,10 @@ trait BaseCplxTrait { 
   *   Specific size (summary)

   * @param bool $forced_wysiwyg

   *   Force wysiwyg status (summary)

   * @param bool $force_uuid

   *   Force generating UUID (summary)

   */

  public function makeAttachement(&$element, array $color_settings = NULL, $optimal_size = NULL, $forced_wysiwyg = NULL) {

  public function makeAttachement(&$element, array $color_settings = NULL, $optimal_size = NULL, $forced_wysiwyg = NULL, $force_uuid = FALSE) {



    $is_wysiwyg = ($forced_wysiwyg === NULL) ? $this->isWysiwyg : $forced_wysiwyg;

    $fieldMaxSize = ($this->isLong == TRUE) ? 1000000 : 255;
@@ -322,7 +324,7 @@ trait BaseCplxTrait { 
        ];

      }



      if ($this->fieldDefinition instanceof FieldConfig) {

      if ($this->fieldDefinition instanceof FieldConfig && !$force_uuid) {

        $uuid = $this->fieldDefinition->get('uuid');

      }

      else {

src/Plugin/Field/FieldWidget/BaseSimpleTrait.php

+4 −2
Original line number Diff line number Diff line
@@ -123,8 +123,10 @@ trait BaseSimpleTrait { 
   *   Force wysiwyg status (summary)

   * @param array $forced_settings

   *   Specific color settings (summary)

   * @param bool $force_uuid

   *   Force generating UUID (summary)

   */

  public function makeAttachement(&$element, $forced_wysiwyg = NULL, array $forced_settings = []) {

  public function makeAttachement(&$element, $forced_wysiwyg = NULL, array $forced_settings = [], $force_uuid = FALSE ) {



    $is_wysiwyg = ($forced_wysiwyg === NULL) ? $this->isWysiwyg : $forced_wysiwyg;
@@ -148,7 +150,7 @@ trait BaseSimpleTrait { 
    $element["#maxlength"] = (int) $lock;



    $field_definition = $this->fieldDefinition;

    if ($field_definition instanceof FieldConfig) {

    if ($field_definition instanceof FieldConfig && !$force_uuid) {

      $uuid = $this->fieldDefinition->get('uuid');

    }

    else {

src/Plugin/Field/FieldWidget/CplxWysiwygSummaryWidget.php

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ class CplxWysiwygSummaryWidget extends TextareaWithSummaryWidget { 
      $color_settings = ($summary_settings['color_settings'] != $this->emptyConf) ? $summary_settings['color_settings'] : [];

      $optimal_size = ($summary_settings['optimal_size'] != $this->fieldMaxSize) ? $summary_settings['optimal_size'] : $max_char;



      $this->makeAttachement($element['summary'], $color_settings, $optimal_size, FALSE);

      $this->makeAttachement($element['summary'], $color_settings, $optimal_size, FALSE, TRUE);

    }



    // For main.

src/Plugin/Field/FieldWidget/SimpleWysiwygSummaryWidget.php

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ class SimpleWysiwygSummaryWidget extends TextareaWithSummaryWidget { 


      $full_settings = $this->getSetting('summary_wrapper');



      $this->makeAttachement($element['summary'], FALSE, $full_settings);

      $this->makeAttachement($element['summary'], FALSE, $full_settings, TRUE);

    }



    // For main.