Permalink
Browse files

FIXED: Issue where urls with querystring arguments would not be prope…

…rly 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.
  • Loading branch information...
1 parent 1432a8e commit a80daef2c6c38d40a08028aead43b51cc2aeb742 @tractorcow tractorcow committed Aug 8, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 javascript/TreeDropdownField.js
View
6 javascript/TreeDropdownField.js
@@ -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;
}
}

0 comments on commit a80daef

Please sign in to comment.