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

FIX Use absolute URL for submitted file links in emails (#1226)

Browse Source
This commit is contained in:
Guy Sartorelli 2023-08-08 14:53:14 +12:00 committed by GitHub
parent 495ca85ea4
commit 60717e5c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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; namespace SilverStripe\UserForms\Model\Submission;
use SilverStripe\Assets\File; use SilverStripe\Assets\File;
use SilverStripe\Control\Director;
use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
@ -83,7 +84,11 @@ class SubmittedFileField extends SubmittedFormField
{ {
if ($file = $this->getUploadedFileFromDraft()) { if ($file = $this->getUploadedFileFromDraft()) {
if ($file->exists()) { if ($file->exists()) {
return $file->getURL($grant); $url = $file->getURL($grant);
if ($url) {
return Director::absoluteURL($url);
}
return null;
} }
} }
} }

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

@ -5,6 +5,7 @@ namespace SilverStripe\UserForms\Tests\Model;
use SilverStripe\Assets\Dev\TestAssetStore; use SilverStripe\Assets\Dev\TestAssetStore;
use SilverStripe\Assets\File; use SilverStripe\Assets\File;
use SilverStripe\Assets\Storage\AssetStore; use SilverStripe\Assets\Storage\AssetStore;
use SilverStripe\Control\Director;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\UserForms\Model\Submission\SubmittedFileField; use SilverStripe\UserForms\Model\Submission\SubmittedFileField;
@ -69,21 +70,23 @@ class SubmittedFileFieldTest extends SapphireTest
public function testGetFormattedValue() 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(); $fileName = $this->submittedFile->getFileName();
$message = "You don't have the right permissions to download this file"; $message = "You don't have the right permissions to download this file";
$this->file->CanViewType = 'OnlyTheseUsers'; $this->file->CanViewType = 'OnlyTheseUsers';
$this->file->write(); $this->file->write();
$this->loginWithPermission('ADMIN'); $this->loginWithPermission('ADMIN');
$this->assertEquals( $this->assertEquals(
sprintf( 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 $fileName
), ),
$this->submittedFile->getFormattedValue()->value $this->submittedFile->getFormattedValue()->value
); );
$this->loginWithPermission('CMS_ACCESS_CMSMain'); $this->loginWithPermission('CMS_ACCESS_CMSMain');
$this->assertEquals( $this->assertEquals(
sprintf( sprintf(