mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #713 from tractorcow/3.0-translatable-compatibility-fixes
FIXED: Compatibility issues with the Translatable module
This commit is contained in:
commit
b5695e2cbf
@ -193,11 +193,13 @@
|
||||
'data': this.getPanel().find('.tree-holder').html(),
|
||||
'ajax': {
|
||||
'url': function(node) {
|
||||
return self.data('urlTree') + '/' + ($(node).data("id") ? $(node).data("id") : 0);
|
||||
var url = $.path.parseUrl(self.data('urlTree')).hrefNoSearch;
|
||||
return url + '/' + ($(node).data("id") ? $(node).data("id") : 0);
|
||||
},
|
||||
'data': function(node) {
|
||||
var query = $.query.load(self.data('urlTree')).keys;
|
||||
var params = self.getRequestParams();
|
||||
params = $.extend({}, params, {ajax: 1});
|
||||
params = $.extend({}, query, params, {ajax: 1});
|
||||
return params;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user