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

BUG Fix minor html encoding issue in SecurityAdmin (#6240)

Browse Source
This commit is contained in:
Damian Mooyman 2016-10-28 15:22:21 +13:00 committed by Sam Minnée
parent 1df533298d
commit d7ed308e17
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/code/GroupImportForm.php
View File

@ -8,6 +8,7 @@ use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\FormAction;
use SilverStripe\Forms\RequiredFields;
use SilverStripe\Forms\Form;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\Security\Group;
use SilverStripe\Security\GroupCsvBulkLoader;
@ -52,10 +53,10 @@ class GroupImportForm extends Form {
new LiteralField('Help', $helpHtml),
$fileField = new FileField(
'CsvFile',
_t(
DBField::create_field('HTMLFragment', _t(
'SecurityAdmin_MemberImportForm.FileFieldLabel',
'CSV File <small>(Allowed extensions: *.csv)</small>'
)
))
)
);
$fileField->getValidator()->setAllowedExtensions(array('csv'));

5
admin/code/MemberImportForm.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\Admin;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\Security\Group;
use SilverStripe\Security\MemberCsvBulkLoader;
use SilverStripe\Forms\LiteralField;
@ -52,10 +53,10 @@ class MemberImportForm extends Form {
new LiteralField('Help', $helpHtml),
$fileField = new FileField(
'CsvFile',
_t(
DBField::create_field('HTMLFragment', _t(
'SecurityAdmin_MemberImportForm.FileFieldLabel',
'CSV File <small>(Allowed extensions: *.csv)</small>'
)
))
)
);
$fileField->getValidator()->setAllowedExtensions(array('csv'));