tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.15' into 5

Browse Source
This commit is contained in:
github-actions 2023-08-16 12:37:55 +00:00
commit 1fb7c8ab83
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/Model/Submission/SubmittedFileField.php
View File

@ -3,6 +3,7 @@
namespace SilverStripe\UserForms\Model\Submission;
use SilverStripe\Assets\File;
use SilverStripe\Control\Director;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\Versioned\Versioned;
@ -83,7 +84,11 @@ class SubmittedFileField extends SubmittedFormField
{
if ($file = $this->getUploadedFileFromDraft()) {
if ($file->exists()) {
return $file->getURL($grant);
$url = $file->getURL($grant);
if ($url) {
return Director::absoluteURL($url);
}
return null;
}
}
}

5
tests/php/Model/SubmittedFileFieldTest.php
View File

@ -5,6 +5,7 @@ namespace SilverStripe\UserForms\Tests\Model;
use SilverStripe\Assets\Dev\TestAssetStore;
use SilverStripe\Assets\File;
use SilverStripe\Assets\Storage\AssetStore;
use SilverStripe\Control\Director;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\UserForms\Model\Submission\SubmittedFileField;
@ -69,6 +70,8 @@ class SubmittedFileFieldTest extends SapphireTest
public function testGetFormattedValue()
{
// Set an explicit base URL so we get a reliable value for the test
Director::config()->set('alternate_base_url', 'http://mysite.com');
$fileName = $this->submittedFile->getFileName();
$message = "You don't have the right permissions to download this file";
@ -78,7 +81,7 @@ class SubmittedFileFieldTest extends SapphireTest
$this->loginWithPermission('ADMIN');
$this->assertEquals(
sprintf(
'%s - <a href="/assets/3c01bdbb26/test-SubmittedFileFieldTest.txt" target="_blank">Download File</a>',
'%s - <a href="http://mysite.com/assets/3c01bdbb26/test-SubmittedFileFieldTest.txt" target="_blank">Download File</a>',
$fileName
),
$this->submittedFile->getFormattedValue()->value