Fix for view preview bug with _count
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a09318fa Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a09318fa Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a09318fa Branch: refs/heads/api-options Commit: a09318fa85365cf8e4d6718e3c3cb07aba76d990 Parents: c56e5a8 Author: suelockwood <[email protected]> Authored: Thu Jan 16 09:48:42 2014 -0500 Committer: suelockwood <[email protected]> Committed: Thu Jan 16 09:48:42 2014 -0500 ---------------------------------------------------------------------- src/fauxton/app/addons/documents/views.js | 6 +++--- src/fauxton/app/addons/pouchdb/pouch.collate.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/a09318fa/src/fauxton/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 9902541..bde08f8 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -1476,12 +1476,12 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum var promise = FauxtonAPI.Deferred(); - if (!this.database.allDocs) { + if (!this.database.allDocs || this.database.allDocs.params.include_docs !== true) { this.database.buildAllDocs({limit: Databases.DocLimit.toString(), include_docs: true}); promise = this.database.allDocs.fetch(); - } else { + } else { promise.resolve(); - } + } promise.then(function () { params.docs = that.database.allDocs.map(function (model) { return model.get('doc');}); http://git-wip-us.apache.org/repos/asf/couchdb/blob/a09318fa/src/fauxton/app/addons/pouchdb/pouch.collate.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/pouchdb/pouch.collate.js b/src/fauxton/app/addons/pouchdb/pouch.collate.js index 31e5650..8f15808 100644 --- a/src/fauxton/app/addons/pouchdb/pouch.collate.js +++ b/src/fauxton/app/addons/pouchdb/pouch.collate.js @@ -110,6 +110,6 @@ function(app, FauxtonAPI, Collate) { return Pouch; -}).call(this); +});
