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 Update requirements paths to match webpack dists

Browse Source
This commit is contained in:
Robbie Averill 2017-08-23 09:27:12 +12:00
parent 12aad64972
commit d90d54186e
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Extension/UserFormFieldEditorExtension.php
View File

@ -67,7 +67,7 @@ class UserFormFieldEditorExtension extends DataExtension
public function getFieldEditorGrid() public function getFieldEditorGrid()
{ {
$module = ModuleLoader::getModule('silverstripe/userforms'); $module = ModuleLoader::getModule('silverstripe/userforms');
Requirements::javascript($module->getRelativeResourcePath('javascript/FieldEditor.js')); Requirements::javascript($module->getRelativeResourcePath('client/dist/js/userforms-cms.js'));
$fields = $this->owner->Fields(); $fields = $this->owner->Fields();

2
code/Model/Recipient/EmailRecipient.php
View File

@ -175,7 +175,7 @@ class EmailRecipient extends DataObject
public function getCMSFields() public function getCMSFields()
{ {
Requirements::javascript( Requirements::javascript(
ModuleLoader::getModule('silverstripe/userforms')->getRelativeResourcePath('javascript/Recipient.js') ModuleLoader::getModule('silverstripe/userforms')->getRelativeResourcePath('client/dist/js/userforms-cms.js')
); );
// Determine optional field values // Determine optional field values

3
code/Model/UserDefinedForm.php
View File

@ -179,7 +179,8 @@ class UserDefinedForm extends Page
public function getCMSFields() public function getCMSFields()
{ {
Requirements::css( Requirements::css(
ModuleLoader::getModule('silverstripe/userforms')->getRelativeResourcePath('css/UserForm_cms.css') ModuleLoader::getModule('silverstripe/userforms')
->getRelativeResourcePath('client/dist/styles/userforms-cms.css')
); );
$this->beforeUpdateCMSFields(function ($fields) { $this->beforeUpdateCMSFields(function ($fields) {

2
code/Model/UserDefinedFormController.php
View File

@ -58,7 +58,7 @@ class UserDefinedFormController extends PageController
Requirements::javascript( Requirements::javascript(
$userforms->getRelativeResourcePath('client/thirdparty/jquery-validate/jquery.validate.min.js') $userforms->getRelativeResourcePath('client/thirdparty/jquery-validate/jquery.validate.min.js')
); );
Requirements::add_i18n_javascript($userforms->getRelativeResourcePath('javascript/lang')); Requirements::add_i18n_javascript($userforms->getRelativeResourcePath('client/lang'));
Requirements::javascript($userforms->getRelativeResourcePath('client/dist/js/userforms.js')); Requirements::javascript($userforms->getRelativeResourcePath('client/dist/js/userforms.js'));
$this->addUserFormsValidatei18n($userforms); $this->addUserFormsValidatei18n($userforms);