Commit 8a2bae4a authored by Romain Courteaud's avatar Romain Courteaud

ERP5Storage: drop usage of deprecated _id property

parent 6bc97e8e
...@@ -311,7 +311,6 @@ ...@@ -311,7 +311,6 @@
{"_view": this._default_view_reference}) {"_view": this._default_view_reference})
.push(function (response) { .push(function (response) {
var result = JSON.parse(response.target.responseText); var result = JSON.parse(response.target.responseText);
result._id = id;
result.portal_type = result._links.type.name; result.portal_type = result._links.type.name;
// Remove all ERP5 hateoas links / convert them into jIO ID // Remove all ERP5 hateoas links / convert them into jIO ID
...@@ -371,34 +370,10 @@ ...@@ -371,34 +370,10 @@
return jIO.util.ajax(request_options); return jIO.util.ajax(request_options);
}) })
.push(function (evt) { .push(function (evt) {
var content_type = evt.target.getResponseHeader("Content-Type");
if (content_type === "application/json") {
return new RSVP.Queue()
.push(function () {
if (evt.target.responseText === undefined) {
return new RSVP.Queue()
.push(function () {
return jIO.util.readBlobAsText(evt.target.response);
})
.push(function (evt) {
return evt.target.result;
});
}
return evt.target.responseText;
})
.push(function (response_text) {
var result = JSON.parse(response_text);
result._id = id;
return new Blob(
[JSON.stringify(result)],
{"type": content_type}
);
});
}
if (evt.target.response === undefined) { if (evt.target.response === undefined) {
return new Blob( return new Blob(
[evt.target.responseText], [evt.target.responseText],
{"type": content_type} {"type": evt.target.getResponseHeader("Content-Type")}
); );
} }
return evt.target.response; return evt.target.response;
......
...@@ -744,7 +744,6 @@ ...@@ -744,7 +744,6 @@
}) })
.then(function (result) { .then(function (result) {
var expected = JSON.parse(document_hateoas); var expected = JSON.parse(document_hateoas);
expected._id = id;
expected.portal_type = "Person"; expected.portal_type = "Person";
deepEqual(JSON.parse(result.target.result), expected, deepEqual(JSON.parse(result.target.result), expected,
"Attachment correctly fetched"); "Attachment correctly fetched");
...@@ -905,7 +904,6 @@ ...@@ -905,7 +904,6 @@
}) })
.then(function (result) { .then(function (result) {
var expected = JSON.parse(document_hateoas); var expected = JSON.parse(document_hateoas);
expected._id = id;
deepEqual(JSON.parse(result.target.result), expected, deepEqual(JSON.parse(result.target.result), expected,
"Attachment correctly fetched"); "Attachment correctly fetched");
}) })
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment