mirror of
https://github.com/silverstripe/silverstripe-userforms.git
synced 2024-10-22 17:05:42 +02:00
BUGFIX: avoid segfault triggered by component call.
BUGFIX: change the ui version to get the sortable working again.
This commit is contained in:
parent
57097f5905
commit
91743ce3f5
@ -49,15 +49,13 @@ class FieldEditor extends FormField {
|
|||||||
*/
|
*/
|
||||||
function Fields() {
|
function Fields() {
|
||||||
Requirements::css("userforms/css/FieldEditor.css");
|
Requirements::css("userforms/css/FieldEditor.css");
|
||||||
Requirements::javascript(SAPPHIRE_DIR ."/thirdparty/jquery-ui/jquery.ui.core.js");
|
Requirements::javascript(SAPPHIRE_DIR ."/thirdparty/jquery-ui/jquery-ui-1.8rc3.custom.js");
|
||||||
Requirements::javascript(SAPPHIRE_DIR ."/thirdparty/jquery-ui/jquery.ui.widget.js");
|
|
||||||
Requirements::javascript(SAPPHIRE_DIR ."/thirdparty/jquery-ui/jquery.ui.sortable.js");
|
|
||||||
Requirements::javascript("userforms/javascript/UserForm.js");
|
Requirements::javascript("userforms/javascript/UserForm.js");
|
||||||
|
|
||||||
// Don't return any fields unless we actually have the dependent parameters set on the form field
|
// Don't return any fields unless we actually have the dependent parameters set on the form field
|
||||||
if($this->form && $this->form->getRecord() && $this->name) {
|
if($this->form && $this->form->getRecord() && $this->name) {
|
||||||
$relationName = $this->name;
|
$relationName = $this->name;
|
||||||
$fields = $this->form->getRecord()->$relationName();
|
$fields = $this->form->getRecord()->getComponents($relationName);
|
||||||
|
|
||||||
if($fields) {
|
if($fields) {
|
||||||
foreach($fields as $field) {
|
foreach($fields as $field) {
|
||||||
|
Loading…
Reference in New Issue
Block a user