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

BUGFIX: A Submitted file couldn't not be shown / downloaded in the submission report

Browse Source
This commit is contained in:
Stig Lindqvist 2012-05-14 14:16:46 +12:00
parent 0bbfb720ca
commit 1590172d0c
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/model/submissions/SubmittedFileField.php
View File

@ -19,11 +19,12 @@ class SubmittedFileField extends SubmittedFormField {
* @return string * @return string
*/ */
public function getFormattedValue() { public function getFormattedValue() {
$name = $this->getName();
$link = $this->getLink(); $link = $this->getLink();
$title = _t('SubmittedFileField.DOWNLOADFILE', 'Download File'); $title = _t('SubmittedFileField.DOWNLOADFILE', 'Download File');
if($link) { if($link) {
return sprintf('<a href="%s">%s</a>', $link, $title); return sprintf('%s - <a href="%s" target="_blank">%s</a>', $name, $link, $title);
} }
return false; return false;
@ -49,5 +50,16 @@ class SubmittedFileField extends SubmittedFormField {
return $this->UploadedFile()->URL; return $this->UploadedFile()->URL;
} }
} }
} }
/**
* Return the name of the file, if present
*
* @return string
*/
public function getName() {
if($this->UploadedFile()) {
return $this->UploadedFile()->Name;
}
}
} }

2
templates/SubmittedFormReportField.ss
View File

@ -13,7 +13,7 @@
<div id="Text_readonly" class="field readonly text"> <div id="Text_readonly" class="field readonly text">
<label class="left" for="Form_EditForm_Text_readonly">$Title</label> <label class="left" for="Form_EditForm_Text_readonly">$Title</label>
<div class="middleColumn"> <div class="middleColumn">
<span id="Form_EditForm_Text_readonly" class="readonly text">$Value</span> <span id="Form_EditForm_Text_readonly" class="readonly text">$FormattedValue</span>
</div> </div>
</div> </div>