Skip to content
Snippets Groups Projects
Commit f4bf71d6 authored by catch's avatar catch
Browse files

Issue #3418781 by sukr_s, Charles Belov, smustgrave: UI refers to "files" when... 

Issue #3418781 by sukr_s, Charles Belov, smustgrave: UI refers to "files" when you can only upload one file
parent 91840da9
No related branches found
No related tags found
28 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!3878Removed unused condition head title for views,!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,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!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,!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
Pipeline #129512 passed
Stage: 🏗️ Build
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#129513

    Hide whitespace changes
    Inline Side-by-side
    core/modules/media_library/src/Form/FileUploadForm.php
    + 3
    − 1
    View file @ f4bf71d6
    ......@@ -165,7 +165,9 @@ protected function buildInputElement(array $form, FormStateInterface $form_state
    // @todo Move validation in https://www.drupal.org/node/2988215
    '#process' => array_merge(['::validateUploadElement'], $process, ['::processUploadElement']),
    '#upload_validators' => $item->getUploadValidators(),
    '#multiple' => TRUE,
    // Set multiple to true only if available slots is not exactly one
    // to ensure correct language (singular or plural) in UI
    '#multiple' => $slots != 1 ? TRUE : FALSE,
    // Do not limit the number uploaded. There is validation based on the
    // number selected in the media library that prevents overages.
    // @see Drupal\media_library\Form\AddFormBase::updateLibrary()
    ......
    core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php
    + 11
    − 4
    View file @ f4bf71d6
    ......@@ -208,9 +208,12 @@ public function testWidgetUpload() {
    // Assert we can now only upload one more media item.
    $this->openMediaLibraryForField('field_twin_media');
    $this->switchToMediaType('Four');
    // Despite the 'One file only' text, we don't limit the number of uploads.
    $this->assertTrue($assert_session->fieldExists('Add file')->hasAttribute('multiple'));
    // We set the multiple to FALSE if only one file can be uploaded
    $this->assertFalse($assert_session->fieldExists('Add file')->hasAttribute('multiple'));
    $assert_session->pageTextContains('One file only.');
    $choose_files = $assert_session->elementExists('css', '.form-managed-file');
    $choose_files->hasButton('Choose file');
    $this->assertFalse($choose_files->hasButton('Choose files'));
    // Assert media type four should only allow jpg files by trying a png file
    // first.
    ......@@ -555,9 +558,13 @@ public function testWidgetUploadAdvancedUi() {
    // Assert we can now only upload one more media item.
    $this->openMediaLibraryForField('field_twin_media');
    $this->switchToMediaType('Four');
    // Despite the 'One file only' text, we don't limit the number of uploads.
    $this->assertTrue($assert_session->fieldExists('Add file')->hasAttribute('multiple'));
    // We set the multiple to FALSE if only one file can be uploaded
    $this->assertFalse($assert_session->fieldExists('Add file')->hasAttribute('multiple'));
    $assert_session->pageTextContains('One file only.');
    $choose_files = $assert_session->elementExists('css', '.form-managed-file');
    $choose_files->hasButton('Choose file');
    $this->assertFalse($choose_files->hasButton('Choose files'));
    // Assert media type four should only allow jpg files by trying a png file
    // first.
    ......
    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