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

Merge pull request #67 from Sixfifty/patch-1

Browse Source 
Fixed locale for AJAX requests on addWidget.
This commit is contained in:
Michael Parkhill 2013-08-19 20:16:50 -07:00
commit fb655f3862
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/controller/WidgetController.php
View File

@ -99,7 +99,6 @@ class WidgetController extends Controller {
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);
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')) {

11
javascript/WidgetAreaEditor.js
View File

@ -103,10 +103,15 @@
} }
} }
var parentRef=$(this); var parentRef=$(this),
locale = $(this).closest('form').find('input[name=Locale]').val();
$.ajax({ $.ajax({
'url': 'WidgetController/EditableSegment/' + className, 'url': 'WidgetController/EditableSegment/' + className,
'success' : function(response) {parentRef.insertWidgetEditor(response)} 'success' : function(response) {parentRef.insertWidgetEditor(response)},
'data' : {
'locale' : locale ,
},
}); });
}, },
@ -177,4 +182,4 @@
} }
}); });
}) })
})(jQuery); })(jQuery);