Commit 8bd6be7c authored by John Voskuilen's avatar John Voskuilen
Browse files

Issue #3584690: Move field settings to widget setting

parent 220f3148

office_hours.post_update.php

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ use Drupal\field\FieldConfigInterface; 
function office_hours_post_update_implement_office_hours_default_value_config_schema(&$sandbox = NULL) {

  \Drupal::classResolver(ConfigEntityUpdater::class)

    ->update($sandbox, 'field_config', function (FieldConfigInterface $fieldConfig) {

      if ($fieldConfig->getFieldStorageDefinition()->getType() !== 'office_hours') {

      $field_type = $fieldConfig->getFieldStorageDefinition()->getType();

      if ($field_type !== 'office_hours') {

        return FALSE;

      }

src/Element/OfficeHoursBaseSlot.php

+5 −5
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class OfficeHoursBaseSlot extends FormElementBase { 
    $day = $value['day'];

    $day_delta = $element['#day_delta'];



    $max_delta = $element['#field_settings']['cardinality_per_day'] - 1;

    $max_delta = $element['#settings']['cardinality_per_day'] - 1;



    // Step 1. Prepare the unique values per operation.

    // Note: the operations key is also used in JS, e.g., $('[id$=add]').
@@ -147,7 +147,7 @@ class OfficeHoursBaseSlot extends FormElementBase { 
    // Add day_delta for label() or isEmpty() call.

    $value['day_delta'] = $day_delta;



    $field_settings = $element['#field_settings'];

    $field_settings = $element['#settings'];

    $time_format = $field_settings['time_format'];



    // Prepare $element['#value'] for Form element/Widget.
@@ -161,7 +161,7 @@ class OfficeHoursBaseSlot extends FormElementBase { 
    ];

    $element['starthours'] = [

      '#type' => $field_settings['element_type'], // 'datelist', 'datetime'.

      '#field_settings' => $field_settings,

      '#settings' => $field_settings,

      '#date_increment' => $field_settings['increment'],



      // Attributes for element \Drupal\Core\Datetime\Element\Datelist - Start.
@@ -183,7 +183,7 @@ class OfficeHoursBaseSlot extends FormElementBase { 
      '#default_value' => $value['comment'],

      '#size' => 20,

      '#maxlength' => 255,

      '#field_settings' => $field_settings,

      '#settings' => $field_settings,

    ];



    // Copy from \Drupal\Core\Entity\EntityListBuilder::buildOperations().
@@ -259,7 +259,7 @@ class OfficeHoursBaseSlot extends FormElementBase { 
      return;

    }



    $field_settings = $element['#field_settings'];

    $field_settings = $element['#settings'];

    $date_helper = new OfficeHoursDateHelper();

    // Exception: end time 00:00 --> 24:00.

    $start = $date_helper->format($value['starthours'], 'Hi', FALSE);

src/Element/OfficeHoursDatelist.php

+3 −3
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ class OfficeHoursDatelist extends Datelist { 
  public static function processDatelist(&$element, FormStateInterface $form_state, &$complete_form): array {

    $element = parent::processDatelist($element, $form_state, $complete_form);



    $time_format = $element['#field_settings']['time_format'];

    $limit_start = $element['#field_settings']['limit_start'];

    $limit_end = $element['#field_settings']['limit_end'];

    $time_format = $element['#settings']['time_format'];

    $limit_start = $element['#settings']['limit_start'];

    $limit_end = $element['#settings']['limit_end'];



    // Get the valid, restricted hours.

    // Date API doesn't provide a straight method for this.

src/Element/OfficeHoursDatetime.php

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class OfficeHoursDatetime extends Datetime { 
    $element = parent::processDatetime($element, $form_state, $complete_form);



    // Fix the convention: convert minutes into seconds.

    $increment = $element['#field_settings']['increment'];

    $increment = $element['#settings']['increment'];

    $element['time']['#attributes']['step'] = $increment * 60;

    return $element;

  }

src/Element/OfficeHoursListSlot.php

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class OfficeHoursListSlot extends OfficeHoursBaseSlot { 
    $day = $value['day'];



    // Add standardized labels to time slot element.

    $field_settings = $element['#field_settings'];

    $field_settings = $element['#settings'];

    $labels = OfficeHoursItem::getPropertyLabels('#prefix', $field_settings);



    $element['day'] = [