diff --git a/code/Model/Submission/SubmittedFileField.php b/code/Model/Submission/SubmittedFileField.php
index 94829d9..1a57cce 100755
--- a/code/Model/Submission/SubmittedFileField.php
+++ b/code/Model/Submission/SubmittedFileField.php
@@ -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;
}
}
}
diff --git a/tests/php/Model/SubmittedFileFieldTest.php b/tests/php/Model/SubmittedFileFieldTest.php
index 62d4c12..8bb96fd 100644
--- a/tests/php/Model/SubmittedFileFieldTest.php
+++ b/tests/php/Model/SubmittedFileFieldTest.php
@@ -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;
@@ -70,16 +71,18 @@ 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";
$this->file->CanViewType = 'OnlyTheseUsers';
$this->file->write();
-
+
$this->loginWithPermission('ADMIN');
$this->assertEquals(
sprintf(
- '%s - Download File',
+ '%s - Download File',
$fileName
),
$this->submittedFile->getFormattedValue()->value