diff --git a/src/Models/FileLink.php b/src/Models/FileLink.php index b25703ad..22dbe175 100644 --- a/src/Models/FileLink.php +++ b/src/Models/FileLink.php @@ -74,7 +74,6 @@ protected function getDefaultTitle(): string if (!$file?->exists()) { return _t(__CLASS__ . '.MISSING_DEFAULT_TITLE', '(File missing)'); } - - return (string) $this->getDescription(); + return $file->Title; } } diff --git a/tests/behat/features/create-edit-linkfield.feature b/tests/behat/features/create-edit-linkfield.feature index 169d8c6f..0a12cb05 100644 --- a/tests/behat/features/create-edit-linkfield.feature +++ b/tests/behat/features/create-edit-linkfield.feature @@ -147,7 +147,7 @@ I want to add links to pages, files, external URLs, email addresses and phone nu # Fourth link in multi link field And I should see "Link to a file" in the "[data-field-id='Form_EditForm_HasManyLinks'] .link-picker__link:nth-of-type(4)" element - And I should see "folder1/file1.jpg" in the "[data-field-id='Form_EditForm_HasManyLinks'] .link-picker__link:nth-of-type(4)" element + And I should see "File1" in the "[data-field-id='Form_EditForm_HasManyLinks'] .link-picker__link:nth-of-type(4)" element And I should see "Draft" in the "[data-field-id='Form_EditForm_HasManyLinks'] .link-picker__link:nth-of-type(4)" element # Test that user can publish the page with links @@ -203,5 +203,6 @@ I want to add links to pages, files, external URLs, email addresses and phone nu And I wait for 2 seconds And I should see "Link to a file" in the "[data-field-id='Form_EditForm_HasManyLinks'] .link-picker__link--is-first" element + And I should see "File1" in the "[data-field-id='Form_EditForm_HasManyLinks'] .link-picker__link--is-first" element And I should see "folder1/file1.jpg" in the "[data-field-id='Form_EditForm_HasManyLinks'] .link-picker__link--is-first" element And I should see "Draft" in the "[data-field-id='Form_EditForm_HasManyLinks'] .link-picker__link--is-first" element diff --git a/tests/php/Models/FileLinkTest.php b/tests/php/Models/FileLinkTest.php index e349f796..3aad356d 100644 --- a/tests/php/Models/FileLinkTest.php +++ b/tests/php/Models/FileLinkTest.php @@ -46,6 +46,7 @@ public function testGetDefaultTitle(): void $link = new FileLink(); $this->assertSame('(File missing)', $reflectionGetDefaultTitle->invoke($link)); // File exists in DB but not in filesystem + // Note that a 'Title' field will be derived from the 'Name' field in File::onBeforeWrite() $file = new TestFileCanView(['Name' => 'My test file']); $file->write(); $link->File = $file->ID; @@ -56,6 +57,6 @@ public function testGetDefaultTitle(): void $file->write(); $link->File = $file->ID; $link->write(); - $this->assertSame('file-b.png', $reflectionGetDefaultTitle->invoke($link)); + $this->assertSame('My test file', $reflectionGetDefaultTitle->invoke($link)); } } diff --git a/tests/php/Models/LinkTest.php b/tests/php/Models/LinkTest.php index fc55dc06..9de1670a 100644 --- a/tests/php/Models/LinkTest.php +++ b/tests/php/Models/LinkTest.php @@ -297,7 +297,7 @@ function provideDefaultLinkTitle(): array 'file link with default title' => [ 'identifier' => 'file-link-with-default-title', 'class' => FileLink::class, - 'expected' => '600x400.png' + 'expected' => 'Image1' ], ]; }