Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(ngResource): Add suport for nested params #1640

Closed
wants to merge 1 commit into from
Closed

fix(ngResource): Add suport for nested params #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions src/ngResource/resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ angular.module('ngResource', ['ng']).
extend = angular.extend,
copy = angular.copy,
isFunction = angular.isFunction,
isArray = angular.isArray,
isObject = angular.isObject,
getter = function(obj, path) {
return $parse(path)(obj);
};
Expand Down Expand Up @@ -267,6 +269,19 @@ angular.module('ngResource', ['ng']).
replace((pctEncodeSpaces ? null : /%20/g), '+');
}

function buildQuery(value, prefix) {
var out = [];
if (isArray(value) || isObject(value)) {
forEach(value, function(v, k) {
var newPrefix = prefix ? prefix + '[' + k + ']' : k;
out = out.concat(buildQuery(v, newPrefix));
});
} else {
out.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(value));
}
return out;
}

function Route(template, defaults) {
this.template = template = template + '#';
this.defaults = defaults || {};
Expand Down Expand Up @@ -296,15 +311,17 @@ angular.module('ngResource', ['ng']).
url = url.replace(new RegExp("/?:" + urlParam + "(\\W)", "g"), '$1');
}
});
url = url.replace(/\/?#$/, '');
var query = [];

var serializeableParams = {};
forEach(params, function(value, key){
if (!self.urlParams[key]) {
query.push(encodeUriQuery(key) + '=' + encodeUriQuery(value));
serializeableParams[key] = value;
}
});

var query = buildQuery(serializeableParams);
query.sort();
url = url.replace(/\/*$/, '');
url = url.replace(/\/?#$/, '').replace(/\/*$/, '');
return url + (query.length ? '?' + query.join('&') : '');
}
};
Expand Down
2 changes: 2 additions & 0 deletions test/ngResource/resourceSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ describe("resource", function() {

$httpBackend.expect('GET', '/Path/foo%231').respond('{}');
$httpBackend.expect('GET', '/Path/doh!@foo?bar=baz%231').respond('{}');
$httpBackend.expect('GET', '/Path/doh?bar%5B0%5D=e&bar%5B1%5D%5Bbaz%5D=z&foo%5Bc%5D=d').respond('{}');

R.get({a: 'foo#1'});
R.get({a: 'doh!@foo', bar: 'baz#1'});
R.get({a: 'doh', foo: {c: 'd'}, bar: ['e', {baz: 'z'}]});
});


Expand Down