You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/02/26 13:58:31 UTC
git commit: AMBARI-4835. Custom property names with asterisk are
invalid keys. (Mikhail Bayuk via alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 225fb253c -> e6ba88fb0
AMBARI-4835. Custom property names with asterisk are invalid keys. (Mikhail Bayuk via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6ba88fb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6ba88fb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6ba88fb
Branch: refs/heads/trunk
Commit: e6ba88fb0a5b47c7b23604e5d6cdcad3324f3fb2
Parents: 225fb25
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Feb 26 14:58:23 2014 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Feb 26 14:58:23 2014 +0200
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 +-
ambari-web/app/utils/validator.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6ba88fb/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 70e0f77..975b621 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -694,7 +694,7 @@ Em.I18n.translations = {
'form.item.placeholders.typePassword':'Type password',
'form.validator.invalidIp':'Please enter valid ip address',
- 'form.validator.configKey':'Invalid Key. Only alphanumerics, hyphens, underscores, and periods are allowed.',
+ 'form.validator.configKey':'Invalid Key. Only alphanumerics, hyphens, underscores, asterisks and periods are allowed.',
'admin.advanced.caution':'This section is for advanced user only.<br/>Proceed with caution.',
'admin.advanced.button.uninstallIncludingData':'Uninstall cluster including all data.',
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6ba88fb/ambari-web/app/utils/validator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/validator.js b/ambari-web/app/utils/validator.js
index b5b850d..9978e77 100644
--- a/ambari-web/app/utils/validator.js
+++ b/ambari-web/app/utils/validator.js
@@ -126,7 +126,7 @@ module.exports = {
* @return {Boolean}
*/
isValidConfigKey: function(value) {
- var configKeyRegex = /^[0-9a-z_\-\.]+$/i;
+ var configKeyRegex = /^[0-9a-z_\-\.\*]+$/i;
return configKeyRegex.test(value);
},
@@ -143,4 +143,4 @@ module.exports = {
return false;
}
}
-};
\ No newline at end of file
+};