Skip to content
Snippets Groups Projects
Unverified Commit 0da5ef42 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Revert "Issue #2575843 by raman.b, ankithashetty, tassilogroeper,... 

Revert "Issue #2575843 by raman.b, ankithashetty, tassilogroeper, Hardik_Patel_12, smustgrave: Cleanup ContentTranslationHandler"

This reverts commit 0d720c3c.
parent 70700fcc
No related branches found
No related tags found
28 merge requests!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!4100Issue #3249600: Add support for PHP 8.1 Enums as allowed values for list_* data types,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3600Issue #3344629: Passing null to parameter #1 ($haystack) of type string is deprecated,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Hide whitespace changes
Inline Side-by-side
core/modules/content_translation/src/ContentTranslationHandler.php
+ 24
− 31
View file @ 0da5ef42
...@@ -563,21 +563,13 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En ...@@ -563,21 +563,13 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
* *
* @see \Drupal\content_translation\ContentTranslationHandler::entityFormAlter() * @see \Drupal\content_translation\ContentTranslationHandler::entityFormAlter()
*/ */
public function entityFormSharedElements(array $element, FormStateInterface $form_state, $form) { public function entityFormSharedElements($element, FormStateInterface $form_state, $form) {
static $ignored_types; static $ignored_types;
// @todo Find a more reliable way to determine if a form element concerns a // @todo Find a more reliable way to determine if a form element concerns a
// multilingual value. // multilingual value.
if (!isset($ignored_types)) { if (!isset($ignored_types)) {
$ignored_types = array_flip([ $ignored_types = array_flip(['actions', 'value', 'hidden', 'vertical_tabs', 'token', 'details', 'link']);
'actions',
'value',
'hidden',
'vertical_tabs',
'token',
'details',
'link',
]);
} }
/** @var \Drupal\Core\Entity\ContentEntityForm $form_object */ /** @var \Drupal\Core\Entity\ContentEntityForm $form_object */
...@@ -598,30 +590,31 @@ public function entityFormSharedElements(array $element, FormStateInterface $for ...@@ -598,30 +590,31 @@ public function entityFormSharedElements(array $element, FormStateInterface $for
if (!isset($element[$key]['#type'])) { if (!isset($element[$key]['#type'])) {
$this->entityFormSharedElements($element[$key], $form_state, $form); $this->entityFormSharedElements($element[$key], $form_state, $form);
} }
// Ignore non-widget form elements. else {
if (isset($ignored_types[$element[$key]['#type']])) { // Ignore non-widget form elements.
continue; if (isset($ignored_types[$element[$key]['#type']])) {
} continue;
// Elements are considered to be non-multilingual by default.
if (!empty($element[$key]['#multilingual'])) {
continue;
}
// If we are displaying a multilingual entity form we need to provide
// translatability clues, otherwise the non-multilingual form elements
// should be hidden.
if (!$translation_form) {
if ($display_translatability_clue) {
$this->addTranslatabilityClue($element[$key]);
} }
// Hide widgets for untranslatable fields. // Elements are considered to be non multilingual by default.
if ($hide_untranslatable_fields && isset($field_definitions[$key])) { if (empty($element[$key]['#multilingual'])) {
$element[$key]['#access'] = FALSE; // If we are displaying a multilingual entity form we need to provide
$display_warning = TRUE; // translatability clues, otherwise the non-multilingual form elements
// should be hidden.
if (!$translation_form) {
if ($display_translatability_clue) {
$this->addTranslatabilityClue($element[$key]);
}
// Hide widgets for untranslatable fields.
if ($hide_untranslatable_fields && isset($field_definitions[$key])) {
$element[$key]['#access'] = FALSE;
$display_warning = TRUE;
}
}
else {
$element[$key]['#access'] = FALSE;
}
} }
} }
else {
$element[$key]['#access'] = FALSE;
}
} }
if ($display_warning && !$form_state->isSubmitted() && !$form_state->isRebuilding()) { if ($display_warning && !$form_state->isSubmitted() && !$form_state->isRebuilding()) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment