Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tez-ui/src/main/webapp/app/routes/server-side-ops.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default AbstractRoute.extend({
return this.load(null, query).then(function (data) {
if(that.get("controller.loadingMore")) {
that.set("controller.loadingMore", false);
that.get("loadedValue").pushObjects(data);
that.get("loadedValue").pushObjects(data.content);
return data;
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,15 @@ test('loadNewPage test', function(assert) {
let currentQuery = {
val: {}
},
data = [],
data = {content: []},
fromId = "id1",
route = this.subject({
controller: Ember.Object.create(),
currentQuery: currentQuery,
fromId: fromId,
loadedValue: {
pushObjects: function (objs) {
assert.equal(data, objs);
assert.equal(data.content, objs);
}
},
load: function (value, query) {
Expand Down