Repository: couchdb Updated Branches: refs/heads/master fda86ae1c -> 88e1bca62
Fix missing stale query option Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/dc1b1484 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/dc1b1484 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/dc1b1484 Branch: refs/heads/master Commit: dc1b1484918205570db34349c5875f7e050d31f9 Parents: fda86ae Author: Garren Smith <[email protected]> Authored: Mon Jun 30 12:27:18 2014 +0200 Committer: Garren Smith <[email protected]> Committed: Mon Jun 30 12:27:18 2014 +0200 ---------------------------------------------------------------------- .../documents/templates/advanced_options.html | 8 ++----- src/fauxton/app/addons/documents/views.js | 22 +++++++------------- 2 files changed, 9 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/dc1b1484/src/fauxton/app/addons/documents/templates/advanced_options.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/advanced_options.html b/src/fauxton/app/addons/documents/templates/advanced_options.html index 439e864..c986d4e 100644 --- a/src/fauxton/app/addons/documents/templates/advanced_options.html +++ b/src/fauxton/app/addons/documents/templates/advanced_options.html @@ -101,10 +101,10 @@ the License. </div> </div> <div class="row-fluid"> - <% if (showPreview) { %> + <% if (showStale) { %> <div class="span6"> <div class="checkbox inline"> - <input id="check7" name="stale" type="checkbox" value="true"> + <input id="check7" name="stale" type="checkbox" value="ok"> <label for="check7">Stale</label> </div> </div> @@ -147,10 +147,6 @@ the License. <% } %> </div> - - - - <div class="controls-group"> <div id="button-options" class="controls controls-row"> <button type="submit" class="btn btn-success">Query</button> http://git-wip-us.apache.org/repos/asf/couchdb/blob/dc1b1484/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 97f82b4..4e7459a 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -592,7 +592,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, toggleTrash: function () { var $bulkdDeleteButton = this.$('.js-bulk-delete'); - if (this.bulkDeleteDocsCollection.length > 0) { + if (this.bulkDeleteDocsCollection && this.bulkDeleteDocsCollection.length > 0) { $bulkdDeleteButton.removeClass('disabled'); } else { $bulkdDeleteButton.addClass('disabled'); @@ -1016,18 +1016,8 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, this.viewName = options.viewName; this.updateViewFn = options.updateViewFn; this.previewFn = options.previewFn; - - if (typeof(options.hasReduce) === 'undefined') { - this.hasReduce = true; - } else { - this.hasReduce = options.hasReduce; - } - - /*if (typeof(options.showPreview) === 'undefined') { - this.showPreview = true; - } else { - this.showPreview = options.showPreview; - }*/ + this.showStale = _.isUndefined(options.showStale) ? false : options.showStale; + this.hasReduce = _.isUndefined(options.hasReduce) ? true : options.hasReduce; }, events: { @@ -1253,7 +1243,8 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, serialize: function () { return { hasReduce: this.hasReduce, - showPreview: false + showPreview: false, + showStale: this.showStale }; } }); @@ -1735,7 +1726,8 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, viewName: this.viewName, ddocName: this.model.id, hasReduce: this.hasReduce(), - eventer: this.eventer + eventer: this.eventer, + showStale: true })); }
