From d48115d2749d80b3efd81055c6d5b638c46834a7 Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Sun, 24 Jun 2012 15:02:15 +0100
Subject: [PATCH] [#162,model/dataset,bugfix][s]: call toJSON on dataset before
 passing to backend on query.

---
 src/model.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/model.js b/src/model.js
index 8963b322..cd14613e 100644
--- a/src/model.js
+++ b/src/model.js
@@ -79,8 +79,13 @@ my.Dataset = Backbone.Model.extend({
 
       self.set(results.metadata);
       self.fields.reset(out.fields);
-      self.query();
-      dfd.resolve(self);
+      self.query()
+        .done(function() {
+          dfd.resolve(self);
+        })
+        .fail(function(arguments) {
+          dfd.reject(arguments);
+        });
     }
 
     return dfd.promise();
@@ -172,7 +177,7 @@ my.Dataset = Backbone.Model.extend({
     }
     var actualQuery = this.queryState.toJSON();
 
-    this._store.query(actualQuery, this)
+    this._store.query(actualQuery, this.toJSON())
       .done(function(queryResult) {
         self._handleQueryResult(queryResult);
         self.trigger('query:done');
@@ -226,7 +231,7 @@ my.Dataset = Backbone.Model.extend({
       query.addFacet(field.id);
     });
     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) {
         _.each(queryResult.facets, function(facetResult, facetId) {
           facetResult.id = facetId;