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

FIXED: Issue where urls with querystring arguments would not be properly concatenated with additional query parameters during ajax requests. The behaviour would not normally be noted except when using a module (such as Translatable) that adds parameters to data-url fields in forms.

Browse Source
This commit is contained in:
Damian Mooyman 2012-08-09 10:18:33 +12:00
parent 1432a8e8a1
commit a80daef2c6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javascript/TreeDropdownField.js
View File

@ -193,11 +193,13 @@
'data': this.getPanel().find('.tree-holder').html(), 'data': this.getPanel().find('.tree-holder').html(),
'ajax': { 'ajax': {
'url': function(node) { '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) { 'data': function(node) {
var query = $.query.load(self.data('urlTree')).keys;
var params = self.getRequestParams(); var params = self.getRequestParams();
params = $.extend({}, params, {ajax: 1}); params = $.extend({}, query, params, {ajax: 1});
return params; return params;
} }
} }