You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/01 16:42:09 UTC
[32/39] ambari git commit: AMBARI-14857 Ambari UI does not accept
dfs.data.dir entries with file protocol when enabling 'storage type' feature.
(ababiichuk)
AMBARI-14857 Ambari UI does not accept dfs.data.dir entries with file protocol when enabling 'storage type' feature. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e15ed442
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e15ed442
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e15ed442
Branch: refs/heads/branch-dev-patch-upgrade
Commit: e15ed4429d5bf8e7c2861342c9b890665fbd1ab7
Parents: 7444981
Author: ababiichuk <ab...@hortonworks.com>
Authored: Mon Feb 1 11:02:54 2016 +0200
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Mon Feb 1 11:02:54 2016 +0200
----------------------------------------------------------------------
ambari-web/app/utils/validator.js | 2 +-
ambari-web/test/utils/validator_test.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e15ed442/ambari-web/app/utils/validator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/validator.js b/ambari-web/app/utils/validator.js
index 82c9f47..6426163 100644
--- a/ambari-web/app/utils/validator.js
+++ b/ambari-web/app/utils/validator.js
@@ -76,7 +76,7 @@ module.exports = {
* @returns {boolean}
*/
isValidDataNodeDir: function(value) {
- var dirRegex = /^(\[[0-9a-zA-Z]+\])?(\/[0-9a-z]*)/;
+ var dirRegex = /^(\[[0-9a-zA-Z]+\])?(file:\/\/)?(\/[0-9a-z]*)/;
var winRegex = /^(\[[0-9a-zA-Z]+\])?[a-zA-Z]:\\[0-9a-zA-Z]*/;
var winUrlRegex = /^(\[[0-9a-zA-Z]+\])?file:\/\/\/[a-zA-Z]:\/[0-9a-zA-Z]*/;
var dirs = value.split(',');
http://git-wip-us.apache.org/repos/asf/ambari/blob/e15ed442/ambari-web/test/utils/validator_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/validator_test.js b/ambari-web/test/utils/validator_test.js
index 5ff6185..ef90561 100644
--- a/ambari-web/test/utils/validator_test.js
+++ b/ambari-web/test/utils/validator_test.js
@@ -327,6 +327,7 @@ describe('validator', function () {
{m:'"/1a2b3c" - valid',i:'/1a2b3c',e:true},
{m:'"[ssd]/1a2b3c" - valid',i:'[ssd]/1a2b3c',e:true},
{m:'"[DISK]/1a2b3c" - valid',i:'[DISK]/1a2b3c',e:true},
+ {m:'"[DISK]file:///1a2b3c" - valid',i:'[DISK]file:///1a2b3c',e:true},
{m:'"[] /1a2b3c" - invalid',i:'[] /1a2b3c',e:false},
{m:'"[ssd] /1a2b3c" - invalid',i:'[ssd] /1a2b3c',e:false},
{m:'"[/1a2b3c]" - invalid',i:'[/1a2b3c]',e:false},