tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed saving of widgets correctly if ID is not numeric

Browse Source 
MINOR Code formatting fixes



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76186 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-05-06 03:31:15 +00:00
parent 0edf8eb19b
commit 892849c0e1
1 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
code/WidgetAreaEditor.php
View File

@ -45,10 +45,9 @@ class WidgetAreaEditor extends FormField {
$name = $this->name; $name = $this->name;
$idName = $name . "ID"; $idName = $name . "ID";
$widgetarea = $record->$name(); $widgetarea = $record->$name();
$widgetarea->write(); $widgetarea->write();
$record->$idName = $widgetarea->ID; $record->$idName = $widgetarea->ID;
$widgets = $widgetarea->Widgets(); $widgets = $widgetarea->Widgets();
@ -56,23 +55,33 @@ class WidgetAreaEditor extends FormField {
// store the field IDs and delete the missing fields // store the field IDs and delete the missing fields
// alternatively, we could delete all the fields and re add them // alternatively, we could delete all the fields and re add them
$missingWidgets = array(); $missingWidgets = array();
foreach($widgets as $existingWidget){ if($widgets) {
$missingWidgets[$existingWidget->ID] = $existingWidget; foreach($widgets as $existingWidget) {
} $missingWidgets[$existingWidget->ID] = $existingWidget;
}
// write the new widgets to the database }
if(isset($_REQUEST['Widget'])){
// write the new widgets to the database
foreach(array_keys( $_REQUEST['Widget'] ) as $newWidgetID ) { if(isset($_REQUEST['Widget'])) {
$newWidgetData = $_REQUEST['Widget'][$newWidgetID]; foreach(array_keys($_REQUEST['Widget']) as $newWidgetID) {
$newWidgetData = $_REQUEST['Widget'][$newWidgetID];
// \"ParentID\"=0 is for the new page // Sometimes the id is "new-1" or similar, ensure this doesn't get into the query
$widget = DataObject::get_one( 'Widget', "(\"ParentID\"='{$record->$name()->ID}' OR \"ParentID\"=0) AND \"Widget\".\"ID\"='$newWidgetID'" ); if(!is_numeric($newWidgetID)) {
$newWidgetID = 0;
}
// \"ParentID\" = '0' is for the new page
$widget = DataObject::get_one(
'Widget',
"(\"ParentID\" = '{$record->$name()->ID}' OR \"ParentID\" = '0') AND \"Widget\".\"ID\" = '$newWidgetID'"
);
// check if we are updating an existing widget // check if we are updating an existing widget
if($widget && isset($missingWidgets[$widget->ID])) if($widget && isset($missingWidgets[$widget->ID])) {
unset($missingWidgets[$widget->ID] ); unset($missingWidgets[$widget->ID]);
}
// create a new object // create a new object
if(!$widget && !empty($newWidgetData['Type']) && class_exists($newWidgetData['Type'])) { if(!$widget && !empty($newWidgetData['Type']) && class_exists($newWidgetData['Type'])) {
@ -85,21 +94,22 @@ class WidgetAreaEditor extends FormField {
} }
} }
if($widget) { if($widget) {
if($widget->ParentID == 0) { if($widget->ParentID == 0) {
$widget->ParentID = $record->$name()->ID; $widget->ParentID = $record->$name()->ID;
} }
$widget->populateFromPostData($newWidgetData);
//$editable->write(); $widget->populateFromPostData($newWidgetData);
} }
} }
}
// remove the fields not saved
if($missingWidgets) {
foreach($missingWidgets as $removedWidget) {
if(isset($removedWidget) && is_numeric($removedWidget->ID)) $removedWidget->delete();
}
} }
// remove the fields not saved
foreach($missingWidgets as $removedWidget) {
if(isset($removedWidget) && is_numeric($removedWidget->ID)) $removedWidget->delete();
}
} }
} }
?> ?>