You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2016/11/08 14:50:02 UTC
[1/2] fauxton commit: updated refs/heads/master to 89f57a4
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master e83138696 -> 89f57a453
semi-colon
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5cc0ee46
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5cc0ee46
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5cc0ee46
Branch: refs/heads/master
Commit: 5cc0ee46a9d590d3a473ecc8b9716789cfb37ca4
Parents: e831386
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Nov 8 16:48:42 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Nov 8 16:48:42 2016 +0200
----------------------------------------------------------------------
app/addons/databases/tests/nightwatch/specialCharListLinks.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5cc0ee46/app/addons/databases/tests/nightwatch/specialCharListLinks.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/specialCharListLinks.js b/app/addons/databases/tests/nightwatch/specialCharListLinks.js
index 2954643..493a4d2 100644
--- a/app/addons/databases/tests/nightwatch/specialCharListLinks.js
+++ b/app/addons/databases/tests/nightwatch/specialCharListLinks.js
@@ -45,7 +45,5 @@ function createTest (db) {
.assert.containsText('.no-results-screen', 'No Documents Found')
.assert.containsText('.faux-header__doc-header-title', db)
.end();
-
-
- }
+ };
}
[2/2] fauxton commit: updated refs/heads/master to 89f57a4
Posted by ga...@apache.org.
support data_size and disk_size
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/89f57a45
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/89f57a45
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/89f57a45
Branch: refs/heads/master
Commit: 89f57a45303375b864cc34388c57e48556ecfb89
Parents: 5cc0ee4
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Nov 8 16:14:37 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Nov 8 16:49:48 2016 +0200
----------------------------------------------------------------------
app/addons/databases/stores.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/89f57a45/app/addons/databases/stores.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/stores.js b/app/addons/databases/stores.js
index 93ae88a..e0145a2 100644
--- a/app/addons/databases/stores.js
+++ b/app/addons/databases/stores.js
@@ -90,9 +90,10 @@ var DatabasesStore = FauxtonAPI.Store.extend({
if (!details) {
return {};
}
+ const dataSize = details.data_size || details.disk_size || 0;
return {
- dataSize: Helpers.formatSize(details.data_size || 0),
+ dataSize: Helpers.formatSize(dataSize),
docCount: details.doc_count,
docDelCount: details.doc_del_count,
showTombstoneWarning: details.doc_del_count > details.doc_count