Skip to content
This repository
Browse code

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...
commit a80daef2c6c38d40a08028aead43b51cc2aeb742 1 parent 1432a8e
Damian Mooyman authored

Showing 1 changed file with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. 6  javascript/TreeDropdownField.js
6  javascript/TreeDropdownField.js
@@ -193,11 +193,13 @@
193 193
 						'data': this.getPanel().find('.tree-holder').html(),
194 194
 						'ajax': {
195 195
 							'url': function(node) {
196  
-								return self.data('urlTree') + '/' + ($(node).data("id") ? $(node).data("id") : 0);
  196
+								var url = $.path.parseUrl(self.data('urlTree')).hrefNoSearch;
  197
+								return url + '/' + ($(node).data("id") ? $(node).data("id") : 0);
197 198
 							},
198 199
 							'data': function(node) {
  200
+								var query = $.query.load(self.data('urlTree')).keys;
199 201
 								var params = self.getRequestParams();
200  
-								params = $.extend({}, params, {ajax: 1});
  202
+								params = $.extend({}, query, params, {ajax: 1});
201 203
 								return params;
202 204
 							}
203 205
 						}

0 notes on commit a80daef

Please sign in to comment.
Something went wrong with that request. Please try again.