knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#162,model/dataset,bugfix][s]: call toJSON on dataset before passing to backend on query.

Browse Source
This commit is contained in:
Rufus Pollock
2012-06-24 15:02:15 +01:00
parent 8cb9ccba9c
commit d48115d274
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/model.js
View File

@@ -79,8 +79,13 @@ my.Dataset = Backbone.Model.extend({
self.set(results.metadata); self.set(results.metadata);
self.fields.reset(out.fields); self.fields.reset(out.fields);
self.query(); self.query()
dfd.resolve(self); .done(function() {
dfd.resolve(self);
})
.fail(function(arguments) {
dfd.reject(arguments);
});
} }
return dfd.promise(); return dfd.promise();
@@ -172,7 +177,7 @@ my.Dataset = Backbone.Model.extend({
} }
var actualQuery = this.queryState.toJSON(); var actualQuery = this.queryState.toJSON();
this._store.query(actualQuery, this) this._store.query(actualQuery, this.toJSON())
.done(function(queryResult) { .done(function(queryResult) {
self._handleQueryResult(queryResult); self._handleQueryResult(queryResult);
self.trigger('query:done'); self.trigger('query:done');
@@ -226,7 +231,7 @@ my.Dataset = Backbone.Model.extend({
query.addFacet(field.id); query.addFacet(field.id);
}); });
var dfd = $.Deferred(); var dfd = $.Deferred();
this._store.query(query.toJSON(), this).done(function(queryResult) { this._store.query(query.toJSON(), this.toJSON()).done(function(queryResult) {
if (queryResult.facets) { if (queryResult.facets) {
_.each(queryResult.facets, function(facetResult, facetId) { _.each(queryResult.facets, function(facetResult, facetId) {
facetResult.id = facetId; facetResult.id = facetId;