diff options
author | suelockwood <deathbear@apache.org> | 2014-01-16 09:48:42 -0500 |
---|---|---|
committer | suelockwood <deathbear@apache.org> | 2014-01-16 09:48:42 -0500 |
commit | a09318fa85365cf8e4d6718e3c3cb07aba76d990 (patch) | |
tree | bb106e94b8ca96d24e1c6ed8331f3e8cdf704dd2 | |
parent | c56e5a88dfed49e0f8661b4b7d579d0860151997 (diff) | |
download | couchdb-a09318fa85365cf8e4d6718e3c3cb07aba76d990.tar.gz |
Fix for view preview bug with _count
-rw-r--r-- | src/fauxton/app/addons/documents/views.js | 6 | ||||
-rw-r--r-- | src/fauxton/app/addons/pouchdb/pouch.collate.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 99025410b..bde08f88d 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');}); diff --git a/src/fauxton/app/addons/pouchdb/pouch.collate.js b/src/fauxton/app/addons/pouchdb/pouch.collate.js index 31e5650a5..8f1580819 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); +}); |