From 1d6003869dfe6b349c027179fa78fe046d823a5d Mon Sep 17 00:00:00 2001 From: Stephen McMahon Date: Thu, 15 Nov 2018 11:56:41 +1100 Subject: [PATCH] Fix(dependency) remove use of SilverStripe\UserForms Currently the `use SilverStripe\UserForms` calls create a hard dependency by moving them into the if blocks it becomes optional --- .../EditableDependentDynamicListField.php | 11 ++++++++--- src/editableformfields/EditableDynamicListField.php | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/editableformfields/EditableDependentDynamicListField.php b/src/editableformfields/EditableDependentDynamicListField.php index 7bf9cfa..abd8347 100644 --- a/src/editableformfields/EditableDependentDynamicListField.php +++ b/src/editableformfields/EditableDependentDynamicListField.php @@ -35,12 +35,17 @@ * * @author Marcus Nyeholt */ + +if (!class_exists(EditableDropdown::class)) { + return; +} + class EditableDependentDynamicListField extends EditableDropdown { private static $db = array( 'SourceList' => 'Varchar(512)', ); - + private static $table_name = 'EditableDependentDynamicListField'; private static $singular_name = 'Dependent Dynamic List field'; @@ -71,7 +76,7 @@ public function getCMSFields() $options = $sourceList->map('Name', 'Title'); } } - + $fields->addFieldToTab('Root.Main', DropdownField::create('SourceList', _t('EditableDependentDynamicListField.SOURCE_LIST_TITLE', 'Source List'), $options)); return $fields; @@ -98,7 +103,7 @@ public function getFormField() $sourceList = DynamicList::get_dynamic_list($source->ListTitle); if ($sourceList) { $items = $sourceList->Items(); - + // now lets create a bunch of option fields foreach ($items as $sourceItem) { // now get the dynamic list that is represented by this one diff --git a/src/editableformfields/EditableDynamicListField.php b/src/editableformfields/EditableDynamicListField.php index 78ec71a..c0c9c01 100644 --- a/src/editableformfields/EditableDynamicListField.php +++ b/src/editableformfields/EditableDynamicListField.php @@ -33,6 +33,11 @@ * * @author Marcus Nyeholt */ + +if (!class_exists(EditableDropdown::class)) { + return; +} + class EditableDynamicListField extends EditableDropdown {