tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-07-02 17:39:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #229 from dnadesign/fixOptionCLass

Browse Source 
Improved FieldEditor to dynamically get the class for EditableOptions
This commit is contained in:
Will Rossiter 2014-08-06 15:28:43 +12:00
commit 44eaf5432a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/formfields/FieldEditor.php
View File

@ -268,6 +268,9 @@ class FieldEditor extends FormField {
if($parent) { if($parent) {
$sql_parent = (int)$parent; $sql_parent = (int)$parent;
$parentObj = EditableFormField::get()->byID($parent);
$optionClass = ($parentObj && $parentObj->exists()) ? $parentObj->getRelationClass('Options') : 'EditableOption';
$sqlQuery = new SQLQuery(); $sqlQuery = new SQLQuery();
$sqlQuery = $sqlQuery $sqlQuery = $sqlQuery
->setSelect("MAX(\"Sort\")") ->setSelect("MAX(\"Sort\")")
@ -277,7 +280,7 @@ class FieldEditor extends FormField {
$sort = $sqlQuery->execute()->value() + 1; $sort = $sqlQuery->execute()->value() + 1;
if($parent) { if($parent) {
$object = new EditableOption(); $object = Injector::inst()->create($optionClass);
$object->write(); $object->write();
$object->ParentID = $parent; $object->ParentID = $parent;
$object->Sort = $sort; $object->Sort = $sort;

4
javascript/UserForm.js
View File

@ -270,8 +270,8 @@
e.preventDefault(); e.preventDefault();
// pass the deleted status onto the element // pass the deleted status onto the element
$(this).parent("li").children("[type=text]").attr("value", "field-node-deleted"); $(this).parents("li:first").find("[type=text]:first").attr("value", "field-node-deleted");
$(this).parent("li").hide(); $(this).parents("li:first").hide();
// Give the user some feedback // Give the user some feedback
statusMessage(userforms.message('REMOVED_OPTION')); statusMessage(userforms.message('REMOVED_OPTION'));