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/03 14:02:00 UTC
[1/2] fauxton commit: updated refs/heads/master to 0db3f7b
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 13d18075c -> 0db3f7bdb
Don't check for existing db for jump to db
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/45569a1f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/45569a1f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/45569a1f
Branch: refs/heads/master
Commit: 45569a1fdf121fb74cec654795cb7bb1cf491fe4
Parents: 13d1807
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Nov 3 15:29:57 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Nov 3 15:29:57 2016 +0200
----------------------------------------------------------------------
app/addons/databases/actions.js | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45569a1f/app/addons/databases/actions.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/actions.js b/app/addons/databases/actions.js
index 9f38663..bd09672 100644
--- a/app/addons/databases/actions.js
+++ b/app/addons/databases/actions.js
@@ -176,16 +176,9 @@ export default {
databaseName = databaseName.trim();
- if (Stores.databasesStore.doesDatabaseExist(databaseName)) {
- var url = FauxtonAPI.urls('allDocs', 'app', app.utils.safeURLName(databaseName), '');
- // use the next cpu tick to allow react-select to unmount prorperly
- return setTimeout(() => { FauxtonAPI.navigate(url); });
- }
-
- FauxtonAPI.addNotification({
- msg: 'Database does not exist.',
- type: 'error'
- });
+ const url = FauxtonAPI.urls('allDocs', 'app', app.utils.safeURLName(databaseName), '');
+ // use the next cpu tick to allow react-select to unmount prorperly
+ return setTimeout(() => { FauxtonAPI.navigate(url); });
},
fetchAllDbsWithKey: (id, callback) => {
[2/2] fauxton commit: updated refs/heads/master to 0db3f7b
Posted by ga...@apache.org.
add correct spacing for pagination
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0db3f7bd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0db3f7bd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0db3f7bd
Branch: refs/heads/master
Commit: 0db3f7bdb3bb4f27ed401bca0d5014dd9642337d
Parents: 45569a1
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Nov 3 15:56:55 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Nov 3 15:56:55 2016 +0200
----------------------------------------------------------------------
app/addons/databases/components.react.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0db3f7bd/app/addons/databases/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/databases/components.react.jsx b/app/addons/databases/components.react.jsx
index 654e0d1..2e4ad36 100644
--- a/app/addons/databases/components.react.jsx
+++ b/app/addons/databases/components.react.jsx
@@ -326,7 +326,7 @@ var DatabasePagination = React.createClass({
render: function () {
const {page, totalAmountOfDatabases} = this.state;
- var urlPrefix = '#/' + this.props.linkPath + '?page=';
+ const urlPrefix = `#/${this.props.linkPath}?page=`;
var start = 1 + (page - 1) * FauxtonAPI.constants.MISC.DEFAULT_PAGE_SIZE;
var end = Math.min(totalAmountOfDatabases, page * FauxtonAPI.constants.MISC.DEFAULT_PAGE_SIZE);
@@ -337,8 +337,8 @@ var DatabasePagination = React.createClass({
</div>
<div className="current-databases">
Showing <span className="all-db-footer__range">{start}–{end}</span>
- of <span className="all-db-footer__total-db-count">{totalAmountOfDatabases}</span>
- databases.
+ of <span className="all-db-footer__total-db-count">{totalAmountOfDatabases}</span>
+ databases.
</div>
</footer>
);