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

MINOR Tabs must be used to indent lines and line lenght preferable less than 100chars.

Browse Source
This commit is contained in:
Stig Lindqvist 2012-10-06 10:27:02 +13:00
parent cc3aa49f9f
commit 57a95c1484
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/form/WidgetAreaEditor.php
View File

@ -94,28 +94,28 @@ class WidgetAreaEditor extends FormField {
} }
// \"ParentID\" = '0' is for the new page // \"ParentID\" = '0' is for the new page
$widget = DataObject::get_one( $widget = DataObject::get_one(
'Widget', 'Widget',
"(\"ParentID\" = '{$record->$name()->ID}' OR \"ParentID\" = '0') AND \"Widget\".\"ID\" = '$newWidgetID'" "(\"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'])) {
$widget = new $newWidgetData['Type'](); $widget = new $newWidgetData['Type']();
$widget->ID = 0; $widget->ID = 0;
$widget->ParentID = $record->$name()->ID; $widget->ParentID = $record->$name()->ID;
if(!is_subclass_of($widget, 'Widget')) {
$widget = null;
}
}
if(!is_subclass_of($widget, 'Widget')) {
$widget = null;
}
}
if($widget) { if($widget) {
if($widget->ParentID == 0) { if($widget->ParentID == 0) {
$widget->ParentID = $record->$name()->ID; $widget->ParentID = $record->$name()->ID;

4
code/model/Widget.php
View File

@ -222,8 +222,8 @@ class Widget_Controller extends Controller {
$className = $this->urlParams['ID']; $className = $this->urlParams['ID'];
if (class_exists('Translatable') && Member::currentUserID()) { if (class_exists('Translatable') && Member::currentUserID()) {
// set current locale based on logged in user's locale // set current locale based on logged in user's locale
$locale = Member::currentUser()->Locale; $locale = Member::currentUser()->Locale;
Translatable::set_current_locale($locale); Translatable::set_current_locale($locale);
i18n::set_locale($locale); i18n::set_locale($locale);
} }
if(class_exists($className) && is_subclass_of($className, 'Widget')) { if(class_exists($className) && is_subclass_of($className, 'Widget')) {