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 invalid import form requirements (#6071)

Browse Source
This commit is contained in:
Damian Mooyman 2016-09-23 16:13:09 +12:00 committed by Sam Minnée
parent f6f3fe561d
commit cbe0ac8507
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Security/CMSSecurity.php
View File

@ -36,7 +36,7 @@ class CMSSecurity extends Security {
protected function init() { protected function init() {
parent::init(); parent::init();
Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/bundle-lib.js'); Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/CMSSecurity.js'); Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/CMSSecurity.js');
} }

2
admin/code/MemberImportForm.php
View File

@ -71,7 +71,7 @@ class MemberImportForm extends Form {
parent::__construct($controller, $name, $fields, $actions, $validator); parent::__construct($controller, $name, $fields, $actions, $validator);
Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/bundle-lib.js', '/')); Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js'); Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js');
Requirements::css(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css'); Requirements::css(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css');

8
admin/code/SecurityAdmin.php
View File

@ -165,7 +165,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
new LiteralField( new LiteralField(
'MemberImportFormIframe', 'MemberImportFormIframe',
sprintf( sprintf(
'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="250px" frameBorder="0">' '<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="330px" frameBorder="0">'
. '</iframe>', . '</iframe>',
$this->Link('memberimport') $this->Link('memberimport')
) )
@ -176,7 +176,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
new LiteralField( new LiteralField(
'GroupImportFormIframe', 'GroupImportFormIframe',
sprintf( sprintf(
'<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="250px" frameBorder="0">' '<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="330px" frameBorder="0">'
. '</iframe>', . '</iframe>',
$this->Link('groupimport') $this->Link('groupimport')
) )
@ -233,7 +233,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
public function memberimport() { public function memberimport() {
Requirements::clear(); Requirements::clear();
Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/bundle-lib.js', '/')); Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js', '/')); Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js', '/'));
Requirements::css(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css', '/')); Requirements::css(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css', '/'));
@ -267,7 +267,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
public function groupimport() { public function groupimport() {
Requirements::clear(); Requirements::clear();
Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/bundle-lib.js', '/')); Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js', '/')); Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js', '/'));
Requirements::css(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css', '/')); Requirements::css(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css', '/'));