You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/08/23 12:05:18 UTC
[ambari] branch branch-2.7 updated: AMBARI-24524 Unable to validate
password complexity for properties rangertagsync_user_password,
rangerusersync_user_password
This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 8eba849 AMBARI-24524 Unable to validate password complexity for properties rangertagsync_user_password, rangerusersync_user_password
8eba849 is described below
commit 8eba8492cf74371f586e57cc01686630ee6800c5
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Wed Aug 22 14:01:04 2018 +0300
AMBARI-24524 Unable to validate password complexity for properties rangertagsync_user_password, rangerusersync_user_password
---
ambari-web/app/mixins/common/serverValidator.js | 7 ++-----
ambari-web/app/styles/application.less | 1 +
ambari-web/app/styles/bootstrap_overrides.less | 14 +++++++-------
ambari-web/app/utils/ajax/ajax.js | 2 +-
ambari-web/app/utils/config.js | 2 +-
5 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ambari-web/app/mixins/common/serverValidator.js b/ambari-web/app/mixins/common/serverValidator.js
index 37d6697..5a363de 100644
--- a/ambari-web/app/mixins/common/serverValidator.js
+++ b/ambari-web/app/mixins/common/serverValidator.js
@@ -197,8 +197,7 @@ App.ServerValidatorMixin = Em.Mixin.create({
name: 'config.validations',
sender: this,
data: validationData,
- success: 'validationSuccess',
- error: 'validationError'
+ success: 'validationSuccess'
});
},
@@ -374,9 +373,7 @@ App.ServerValidatorMixin = Em.Mixin.create({
var parsed = this.parseValidation(data);
this.set('configErrorList', this.collectAllIssues(parsed.configErrorsMap, parsed.generalErrors));
},
-
- validationError: Em.K,
-
+
valueObserver: function () {
var self = this;
if (this.get('isInstallWizard') && this.get('currentTabName') === 'all-configurations') {
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 394d94a..3424b8c 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2214,6 +2214,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
}
.property-description {
font-size: 0.9em;
+ white-space: pre-line;
}
.big-checkbox {
text-align: center;
diff --git a/ambari-web/app/styles/bootstrap_overrides.less b/ambari-web/app/styles/bootstrap_overrides.less
index 70d9945..43ad578 100644
--- a/ambari-web/app/styles/bootstrap_overrides.less
+++ b/ambari-web/app/styles/bootstrap_overrides.less
@@ -30,13 +30,6 @@ select.form-control {
}
}
-.popover {
- word-wrap: break-word;
- small {
- font-size: 1.3rem;
- }
-}
-
.alert {
& > ul, ol {
padding-left: inherit;
@@ -140,11 +133,18 @@ select.form-control {
}
.popover {
+ word-wrap: break-word;
z-index: 10000;
width: 350px;
.popover-inner {
word-wrap: break-word;
}
+ .popover-content {
+ white-space: pre-line;
+ }
+ small {
+ font-size: 1.3rem;
+ }
}
.text-tooltip {
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 1f92f7c..1e50d2c 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -3446,7 +3446,7 @@ var ajax = Em.Object.extend({
* Upon error with one of these statuses modal should be displayed
* @type {Array}
*/
- statuses: ['500', '401', '407', '413'],
+ statuses: [500, 401, 407, 413],
/**
* defaultErrorHandler function is referred from App.ajax.send function and App.HttpClient.defaultErrorHandler function
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 8c05a9a..9593903 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -475,7 +475,7 @@ App.config = Em.Object.create({
var additionalDescription = Em.I18n.t('services.service.config.password.additionalDescription');
if ('password' === displayType) {
if (description && !description.contains(additionalDescription)) {
- return description + '<br />' + additionalDescription;
+ return description + '\n' + additionalDescription;
} else {
return additionalDescription;
}