This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5f9eb7c AMBARI-23207 The tooltip for Overriden properties shown under
manage Config Groups page has '<br/>' in the tooltip text
5f9eb7c is described below
commit 5f9eb7c0e1d9da7f574122f606d15cf91d7ec0af
Author: Andrii Tkach <[email protected]>
AuthorDate: Mon Mar 19 21:25:37 2018 +0200
AMBARI-23207 The tooltip for Overriden properties shown under manage Config
Groups page has '<br/>' in the tooltip text
---
.../controllers/main/service/manage_config_groups_controller.js | 8 ++++----
ambari-web/app/models/configs/config_group.js | 2 +-
ambari-web/app/views/main/service/manage_config_groups_view.js | 2 +-
ambari-web/test/models/configs/config_group_test.js | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 3ef177e..e46d5f9 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -152,7 +152,7 @@ App.ManageConfigGroupsController =
Em.Controller.extend(App.ConfigOverridable, {
addDots = false;
if(propertiesList.length > trimLength) {
// Adjust trim length based on occurrence of <br/> around trim length
- index = propertiesList.substring(trimLength-10,
trimLength+10).indexOf("\n");
+ index = propertiesList.substring(trimLength-10,
trimLength+10).indexOf("<br/>");
if(index > -1) {
trimLength = trimLength - 10 + index;
} else {
@@ -162,10 +162,10 @@ App.ManageConfigGroupsController =
Em.Controller.extend(App.ConfigOverridable, {
if(addDots) {
trimmedText += " ...";
}
- noOfRemainingProperties =
(propertiesList.substring(trimLength).match(new RegExp("\n", "g")) ||
[]).length - 1;
+ noOfRemainingProperties =
(propertiesList.substring(trimLength).match(new RegExp("<br/>", "g")) ||
[]).length - 1;
if(noOfRemainingProperties > 0) {
propertyText = (noOfRemainingProperties > 1) ? "properties" :
"property";
- trimmedText += "\n and " + noOfRemainingProperties + " more " +
propertyText;
+ trimmedText += "<br/> and " + noOfRemainingProperties + " more " +
propertyText;
}
} else {
trimmedText = propertiesList;
@@ -581,7 +581,7 @@ App.ManageConfigGroupsController =
Em.Controller.extend(App.ConfigOverridable, {
* @method showProperties
*/
showProperties: function () {
- var properties = this.get('selectedConfigGroup.propertiesList');
+ var properties = this.get('selectedConfigGroup.propertiesList').htmlSafe();
if (properties) {
App.showAlertPopup(Em.I18n.t('services.service.config_groups_popup.properties'),
properties);
}
diff --git a/ambari-web/app/models/configs/config_group.js
b/ambari-web/app/models/configs/config_group.js
index 678b079..f2f66f7 100644
--- a/ambari-web/app/models/configs/config_group.js
+++ b/ambari-web/app/models/configs/config_group.js
@@ -150,7 +150,7 @@ App.ServiceConfigGroup = DS.Model.extend({
if (Array.isArray(this.get('properties'))) {
this.get('properties').forEach(function (item) {
- result += item.name + " : " + item.value + '\n';
+ result += _.escape(item.name) + " : " + _.escape(item.value) + '<br/>';
}, this);
}
return result;
diff --git a/ambari-web/app/views/main/service/manage_config_groups_view.js
b/ambari-web/app/views/main/service/manage_config_groups_view.js
index 4973984..7574221 100644
--- a/ambari-web/app/views/main/service/manage_config_groups_view.js
+++ b/ambari-web/app/views/main/service/manage_config_groups_view.js
@@ -101,7 +101,7 @@ App.MainServiceManageConfigGroupView = Em.View.extend({
showTooltip: function () {
if (!this.get('controller.isLoaded')) return false;
Em.run.next(function(){
- App.tooltip($('.properties-link'));
+ App.tooltip($('.properties-link'), {html: true});
App.tooltip($("[rel='button-info']"));
App.tooltip($("[rel='button-info-dropdown']"), {placement: 'left'});
});
diff --git a/ambari-web/test/models/configs/config_group_test.js
b/ambari-web/test/models/configs/config_group_test.js
index 61052b0..1d254c3 100644
--- a/ambari-web/test/models/configs/config_group_test.js
+++ b/ambari-web/test/models/configs/config_group_test.js
@@ -118,7 +118,7 @@ describe('App.ServiceConfigGroup', function () {
value: 'v1'
}
]);
- expect(model.get('propertiesList')).to.equal('p1 : v1\n');
+ expect(model.get('propertiesList')).to.equal('p1 : v1<br/>');
});
});
--
To stop receiving notification emails like this one, please contact
[email protected].
