couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject git commit: updated refs/heads/fauxton-pagination to b958c95
Date Tue, 07 Jan 2014 13:55:10 GMT
Updated Branches:
  refs/heads/fauxton-pagination 4362cc6b5 -> b958c9542


More improvements


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b958c954
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b958c954
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b958c954

Branch: refs/heads/fauxton-pagination
Commit: b958c95423e1e73b376b583a9b788973063d4b74
Parents: 4362cc6
Author: Garren Smith <garren.smith@gmail.com>
Authored: Tue Jan 7 15:54:52 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Tue Jan 7 15:54:52 2014 +0200

----------------------------------------------------------------------
 src/fauxton/app/modules/documents/views.js                | 2 +-
 src/fauxton/app/templates/documents/advanced_options.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b958c954/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 747f828..32f63a2 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -700,7 +700,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
     beforeRender: function() {
       var showNumbers = true;
 
-      if (this.designDocs || this.collection.params.startkey === '"_design"') {
+      if (this.designDocs || this.collection.idxType === '_view' || this.collection.params.startkey
=== '"_design"') {
         showNumbers = false;
       }
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/b958c954/src/fauxton/app/templates/documents/advanced_options.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/advanced_options.html b/src/fauxton/app/templates/documents/advanced_options.html
index 8e96574..e256325 100644
--- a/src/fauxton/app/templates/documents/advanced_options.html
+++ b/src/fauxton/app/templates/documents/advanced_options.html
@@ -67,8 +67,9 @@ the License.
           Limit:
           <select name="limit" class="input-small">
             <option>5</option>
-            <option selected="selected">10</option>
-            <option>25</option>
+            <option>10</option>
+            <option selected="selected">20</option>
+            <option>30</option>
             <option>50</option>
             <option>100</option>
           </select>


Mime
View raw message