Skip to content
Snippets Groups Projects
Verified Commit aa3ecb2c authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2810355 by joseph.olstad, Leksat, ravi.shankar, Berdir, jungle,...

Issue #2810355 by joseph.olstad, Leksat, ravi.shankar, Berdir, jungle, suranga.gamage, adityasingh, benjifisher, Jelle_S, alexpott, Wim Leers, xjm, smustgrave, catch, hchonov, star-szr, webchick, wluisi, dawehner, daffie, cilefen: $entity->isDefaultTranslation() behaves incorrectly when changing default translation, causing file/image field usage to be set to zero, causing files to be deleted
parent 5c8213b5
No related branches found
No related tags found
44 merge requests!12227Issue #3181946 by jonmcl, mglaman,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8323Fix source code editing and in place front page site studio editing.,!6278Issue #3187770 by godotislate, smustgrave, catch, quietone: Views Rendered...,!54479.5.x SF update,!5022Issue #3394406: FileUploadHandler::handleExtensionValidation does not have fallback for sites still using file_validate_extensions,!3878Removed unused condition head title for views,!38582585169-10.1.x,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3546refactored dialog.pcss file,!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3502Issue #3335308: Confusing behavior with FormState::setFormState and FormState::setMethod,!3478Issue #3337882: Deleted menus are not removed from content type config,!3452Issue #3332701: Refactor Claro's tablesort-indicator stylesheet,!3451Issue #2410579: Allows setting the current language programmatically.,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3147Issue #3328457: Replace most substr($a, $i) where $i is negative with str_ends_with(),!3146Issue #3328456: Replace substr($a, 0, $i) with str_starts_with(),!3133core/modules/system/css/components/hidden.module.css,!31312878513-10.1.x,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2614Issue #2981326: Replace non-test usages of \Drupal::logger() with IoC injection,!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,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!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,!877Issue #2708101: Default value for link text is not saved,!844Resolve #3036010 "Updaters",!673Issue #3214208: FinishResponseSubscriber could create duplicate headers,!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.
Pipeline #33151 failed
Pipeline: drupal

#33159

    Pipeline: drupal

    #33158

      Pipeline: drupal

      #33157

        +1
        ......@@ -86,6 +86,18 @@ abstract class ContentEntityBase extends EntityBase implements \IteratorAggregat
        */
        protected $activeLangcode = LanguageInterface::LANGCODE_DEFAULT;
        /**
        * Override the result of isDefaultTranslation().
        *
        * Under certain circumstances, such as when changing default translation, the
        * default value needs to be overridden.
        *
        * @var bool|null
        *
        * @internal
        */
        protected ?bool $enforceDefaultTranslation = NULL;
        /**
        * Local cache for the default language code.
        *
        ......@@ -409,10 +421,28 @@ public function setRevisionTranslationAffectedEnforced($enforced) {
        return $this;
        }
        /**
        * Set or clear an override of the isDefaultTranslation() result.
        *
        * @param bool|null $enforce_default_translation
        * If boolean value is passed, the value will override the result of
        * isDefaultTranslation() method. If NULL is passed, the default logic will
        * be used.
        *
        * @return $this
        */
        public function setDefaultTranslationEnforced(?bool $enforce_default_translation): static {
        $this->enforceDefaultTranslation = $enforce_default_translation;
        return $this;
        }
        /**
        * {@inheritdoc}
        */
        public function isDefaultTranslation() {
        if ($this->enforceDefaultTranslation !== NULL) {
        return $this->enforceDefaultTranslation;
        }
        return $this->activeLangcode === LanguageInterface::LANGCODE_DEFAULT;
        }
        ......
        ......@@ -944,7 +944,21 @@ protected function invokeFieldMethod($method, ContentEntityInterface $entity) {
        if ($method == 'postSave' && !empty($entity->original)) {
        $original_langcodes = array_keys($entity->original->getTranslationLanguages());
        foreach (array_diff($original_langcodes, $langcodes) as $removed_langcode) {
        /** @var \Drupal\Core\Entity\ContentEntityInterface $translation */
        $translation = $entity->original->getTranslation($removed_langcode);
        // Fields may rely on the isDefaultTranslation() method to determine
        // what is going to be deleted - the whole entity or a particular
        // translation.
        if ($translation->isDefaultTranslation()) {
        if (method_exists($translation, 'setDefaultTranslationEnforced')) {
        $translation->setDefaultTranslationEnforced(FALSE);
        }
        else {
        @trigger_error('Not providing a setDefaultTranslationEnforced() method when implementing \Drupal\Core\TypedData\TranslatableInterface is deprecated in drupal:10.2.0 and is required from drupal:11.0.0. See https://www.drupal.org/node/3376146', E_USER_DEPRECATED);
        }
        }
        $fields = $translation->getTranslatableFields();
        foreach ($fields as $name => $items) {
        $items->delete();
        ......
        ......@@ -215,4 +215,40 @@ public function testSyncedFiles() {
        $this->assertTrue($file->isTemporary());
        }
        /**
        * Tests if file field tracks file usages correctly on translated nodes.
        */
        public function testFileUsage() {
        /** @var \Drupal\file\FileUsage\FileUsageInterface $file_usage */
        $file_usage = \Drupal::service('file.usage');
        // Enable language selector on the page edit form.
        $edit = [
        'language_configuration[language_alterable]' => 1,
        ];
        $this->drupalGet('admin/structure/types/manage/page');
        $this->submitForm($edit, 'Save');
        // Create a node and upload a file.
        $node = $this->drupalCreateNode(['type' => 'page']);
        $edit = [
        'files[' . $this->fieldName . '_0]' => \Drupal::service('file_system')->realpath($this->drupalGetTestFiles('text')[0]->uri),
        ];
        $this->drupalGet('node/' . $node->id() . '/edit');
        $this->submitForm($edit, 'Save');
        // Check if the file usage is correct.
        $file = File::load($this->getLastFileId());
        $this->assertEquals($file_usage->listUsage($file), ['file' => ['node' => [$node->id() => '1']]]);
        // Check if the file usage is tracked correctly when changing the original
        // language of an entity.
        $edit = [
        'langcode[0][value]' => 'fr',
        ];
        $this->drupalGet('node/' . $node->id() . '/edit');
        $this->submitForm($edit, 'Save');
        $this->assertEquals($file_usage->listUsage($file), ['file' => ['node' => [$node->id() => '1']]]);
        }
        }
        ......@@ -297,7 +297,7 @@ public function testEntityPropertiesModifications() {
        // Retrieve the entity properties.
        $reflection = new \ReflectionClass($entity);
        $properties = $reflection->getProperties(~\ReflectionProperty::IS_STATIC);
        $translation_unique_properties = ['activeLangcode', 'translationInitialize', 'fieldDefinitions', 'languages', 'langcodeKey', 'defaultLangcode', 'defaultLangcodeKey', 'revisionTranslationAffectedKey', 'validated', 'validationRequired', 'entityTypeId', 'typedData', 'cacheContexts', 'cacheTags', 'cacheMaxAge', '_serviceIds', '_entityStorages'];
        $translation_unique_properties = ['activeLangcode', 'translationInitialize', 'fieldDefinitions', 'languages', 'langcodeKey', 'defaultLangcode', 'defaultLangcodeKey', 'revisionTranslationAffectedKey', 'validated', 'validationRequired', 'entityTypeId', 'typedData', 'cacheContexts', 'cacheTags', 'cacheMaxAge', '_serviceIds', '_entityStorages', 'enforceDefaultTranslation'];
        foreach ($properties as $property) {
        // Modify each entity property on the clone and assert that the change is
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment