couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to b182c03
Date Wed, 09 Mar 2016 12:45:15 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master bcd091de9 -> b182c03e8


Revert "JS validation added for Add Database"

This reverts commit b8bbb87c6919469521ff277694fb75e898157a7c.

The commit was added in https://github.com/apache/couchdb-fauxton/pull/468
but the validation has to happen in the backend. The current
validation does not cover databases which are created via curl or
other apps. It also prevents users from creating an accidentally
deleted `_users` database.

The fix for the root cause has to happen in the backend.

We should avoid trying to add validations in multiple, different
places.

COUCHDB-2748

PR: #662
PR-URL: https://github.com/apache/couchdb-fauxton/pull/662
Reviewed-By: Alexander Shorin
Reviewed-By: Benjamin Keen <ben.keen@gmail.com>


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

Branch: refs/heads/master
Commit: b182c03e8969ea553f16e9afbe328e981e86130e
Parents: bcd091d
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Tue Mar 8 19:12:04 2016 +0000
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Wed Mar 9 12:44:52 2016 +0000

----------------------------------------------------------------------
 app/addons/databases/actions.js           |  8 ++----
 app/addons/databases/tests/actionsSpec.js | 34 --------------------------
 2 files changed, 2 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b182c03e/app/addons/databases/actions.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/actions.js b/app/addons/databases/actions.js
index 423c62a..e06b64f 100644
--- a/app/addons/databases/actions.js
+++ b/app/addons/databases/actions.js
@@ -81,9 +81,9 @@ function (app, FauxtonAPI, Stores, ActionTypes, Resources) {
     },
 
     createNewDatabase: function (databaseName) {
-      if (_.isNull(databaseName) || databaseName.trim().length === 0 || !this.isValidDatabaseName(databaseName))
{
+      if (_.isNull(databaseName) || databaseName.trim().length === 0) {
         FauxtonAPI.addNotification({
-          msg: 'Please enter a valid database name. The database must start with a letter
and can only contain lowercase letters (a-z), digits (0-9) and the following characters _,
$, (, ), +, -, and /.',
+          msg: 'Please enter a valid database name',
           type: 'error',
           clear: true
         });
@@ -134,10 +134,6 @@ function (app, FauxtonAPI, Stores, ActionTypes, Resources) {
           type: 'error'
         });
       }
-    },
-
-    isValidDatabaseName: function (databaseName) {
-      return (/^[a-z][a-z0-9_\$\(\)\+\/-]*$/).test(databaseName);
     }
   };
 });

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b182c03e/app/addons/databases/tests/actionsSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/actionsSpec.js b/app/addons/databases/tests/actionsSpec.js
index 3c4d8eb..cd69116 100644
--- a/app/addons/databases/tests/actionsSpec.js
+++ b/app/addons/databases/tests/actionsSpec.js
@@ -246,40 +246,6 @@ define([
 
     });
 
-    describe('isValidDatabaseName', function () {
-      it("accepts valid database names", function () {
-        [
-          "one",
-          "one$",
-          "one/",
-          "o-n-e",
-          "o_n_e",
-          "o+n+e",
-          "one(or-two)"
-        ].forEach(function (item) {
-          assert.equal(Actions.isValidDatabaseName(item), true);
-        });
-      });
-
-      it("rejects invalid database names", function () {
-        [
-          "ONE",
-          "_one",
-          "-blah",
-          "one%",
-          "one*",
-          "one@",
-          "one#",
-          "one^",
-          "one~",
-          "one two",
-          " one"
-        ].forEach(function (item) {
-          assert.equal(Actions.isValidDatabaseName(item), false, "item: " + item);
-        });
-      });
-    });
-
   });
 
 });


Mime
View raw message