Merge pull request #28 from tardinha/master

Fix: update templates to allow editable form field visibility to be toggled
symbiote · Oct 9, 2023 · d230dbc · d230dbc
2 parents b4e37e4 + ca62b25
commit d230dbc
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/src/editableformfields/EditableDependentDynamicListField.php b/src/editableformfields/EditableDependentDynamicListField.php
@@ -120,8 +120,8 @@ public function getFormField()
                 $field = DropdownField::create($this->Name, $this->Title, array());
             }
             $field
-                ->setFieldHolderTemplate('UserFormsField_holder')
-                ->setTemplate('UserFormsDropdownField');
+                ->setFieldHolderTemplate(EditableFormField::class . '_holder')
+                ->setTemplate(__CLASS__);
             $this->doUpdateFormField($field);
             return $field;
         }

diff --git a/src/editableformfields/EditableDynamicListField.php b/src/editableformfields/EditableDynamicListField.php
@@ -82,8 +82,8 @@ public function getCMSFields()
     public function getFormField()
     {
         $field = DynamicListField::create($this->Name, $this->Title, $this->ListTitle)
-            ->setFieldHolderTemplate('UserFormsField_holder')
-            ->setTemplate('UserFormsDropdownField');
+            ->setFieldHolderTemplate(EditableFormField::class . '_holder')
+            ->setTemplate(__CLASS__);
         if ($this->UseEmptyString) {
             $field->setEmptyString(($this->EmptyString) ? $this->EmptyString : '');
         }

diff --git a/src/fields/DynamicListField.php b/src/fields/DynamicListField.php
@@ -32,8 +32,6 @@ public function __construct($name, $title = null, $source = null, $value = "", $
             }
         }
 
-        $this->addExtraClass('dropdown');
-
         parent::__construct($name, $title, $source, $value, $form, $emptyString);
     }
 }
diff --git a/templates/Symbiote/DynamicLists/EditableDependentDynamicListField.ss b/templates/Symbiote/DynamicLists/EditableDependentDynamicListField.ss
@@ -0,0 +1 @@
+<% include SilverStripe/UserForms/Model/EditableFormField/EditableDropdown %>
diff --git a/templates/Symbiote/DynamicLists/EditableDynamicListField.ss b/templates/Symbiote/DynamicLists/EditableDynamicListField.ss
@@ -0,0 +1 @@
+<% include SilverStripe/UserForms/Model/EditableFormField/EditableDropdown %>
diff --git a/templates/Symbiote/DynamicLists/EditableFormField_holder.ss b/templates/Symbiote/DynamicLists/EditableFormField_holder.ss
@@ -0,0 +1 @@
+<% include SilverStripe/UserForms/Model/EditableFormField_holder %>
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            $this->addExtraClass('dropdown');
             parent::__construct($name, $title, $source, $value, $form, $emptyString);
         }
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<% include SilverStripe/UserForms/Model/EditableFormField/EditableDropdown %>