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 use sqlquery for building sort query

Browse Source
This commit is contained in:
Will Rossiter 2013-03-05 11:36:39 +13:00
parent c4c547321c
commit 75fb471f2c
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/formfields/FieldEditor.php
View File

@ -182,23 +182,31 @@ class FieldEditor extends FormField {
if($parentID) { if($parentID) {
$parentID = Convert::raw2sql($parentID); $parentID = Convert::raw2sql($parentID);
$highestSort = DB::query("SELECT MAX(\"Sort\") FROM \"EditableFormField\" WHERE \"ParentID\" = '$parentID'"); $sqlQuery = new SQLQuery();
$sqlQuery = $sqlQuery
$sort = $highestSort->value() + 1; ->setSelect('MAX(Sort)')
->setFrom("EditableFormField")
->setWhere("ParentID = $parentID");
$sort = $sqlQuery->execute()->value() + 1;
$className = (isset($_REQUEST['Type'])) ? $_REQUEST['Type'] : ''; $className = (isset($_REQUEST['Type'])) ? $_REQUEST['Type'] : '';
if(!$className) user_error('Please select a field type to created', E_USER_WARNING);
if(!$className) {
user_error('Please select a field type to created', E_USER_WARNING);
}
if(is_subclass_of($className, "EditableFormField")) { if(is_subclass_of($className, "EditableFormField")) {
$field = new $className(); $field = new $className();
$field->write();
$field->ParentID = $this->form->getRecord()->ID; $field->ParentID = $this->form->getRecord()->ID;
$field->Name = $field->class . $field->ID; $field->Name = $field->class . $field->ID;
$field->Sort = $sort; $field->Sort = $sort;
$field->write(); $field->write();
return $field->EditSegment(); return $field->EditSegment();
} }
} }
return false; return false;
} }
@ -215,10 +223,14 @@ class FieldEditor extends FormField {
// work out the sort by getting the sort of the last field in the form +1 // work out the sort by getting the sort of the last field in the form +1
if($parent) { if($parent) {
$sql_parent = Convert::raw2sql($parent); $sql_parent = Convert::raw2sql($parent);
$highestSort = DB::query("SELECT MAX(\"Sort\") FROM \"EditableOption\" WHERE \"ParentID\" = '$sql_parent'");
$sort = $highestSort->value() + 1; $sqlQuery = new SQLQuery();
$sqlQuery = $sqlQuery
->setSelect('MAX(Sort)')
->setFrom("EditableOption")
->setWhere("ParentID = $sql_parent");
$sort = $sqlQuery->execute()->value() + 1;
if($parent) { if($parent) {
$object = new EditableOption(); $object = new EditableOption();
@ -227,9 +239,11 @@ class FieldEditor extends FormField {
$object->Sort = $sort; $object->Sort = $sort;
$object->Name = 'option' . $object->ID; $object->Name = 'option' . $object->ID;
$object->write(); $object->write();
return $object->EditSegment(); return $object->EditSegment();
} }
} }
return false; return false;
} }
} }