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/04/30 11:14:55 UTC
[ambari] branch trunk updated: AMBARI-23715 Config Version
Comparison tool shows diff text merging into each other if config values
are long.
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 12501aa AMBARI-23715 Config Version Comparison tool shows diff text merging into each other if config values are long.
12501aa is described below
commit 12501aab230ecb3d72a5ab1c26f2ebdf3aafd988
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Fri Apr 27 13:56:39 2018 +0300
AMBARI-23715 Config Version Comparison tool shows diff text merging into each other if config values are long.
---
ambari-web/app/styles/service_configurations.less | 5 +++++
.../templates/common/configs/service_config.hbs | 25 ++++++++++++++++++++--
.../views/common/configs/service_config_view.js | 2 +-
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/ambari-web/app/styles/service_configurations.less b/ambari-web/app/styles/service_configurations.less
index 0497172..8d7989c 100644
--- a/ambari-web/app/styles/service_configurations.less
+++ b/ambari-web/app/styles/service_configurations.less
@@ -32,10 +32,15 @@
}
.property-value-column {
+ word-break: break-all;
overflow: auto;
max-height: 300px;
}
+ .accordion-without-tabs {
+ margin-top: 50px;
+ }
+
.comparison-row {
margin-left: -25px;
padding: 10px 0;
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index e6a15ea..29f07dd 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -138,7 +138,7 @@
</ul>
<div class="tab-content service-config-tab-content">
{{#each tab in view.tabs}}
- <div {{bindAttr class=":tab-pane tab.isActive:active isCompareMode:settings-compare-layout tab.id"}}>
+ <div {{bindAttr class=":tab-pane tab.isActive:active tab.id"}}>
{{#if tab.isAdvanced}}
{{#if tab.isRendered}}
{{#if isCompareMode}}
@@ -177,7 +177,28 @@
{{/each}}
</div>
{{else}}
- {{view App.ConfigCategoryContainerView categoriesBinding="selectedService.configCategories" canEditBinding="view.canEdit" serviceBinding="selectedService" serviceConfigsBinding="selectedService.configs" supportsHostOverridesBinding="view.supportsHostOverrides"}}
+ <div class="tab-content service-config-tab-content">
+ {{#if isCompareMode}}
+ <div class="row bottom-border comparison-table-header accordion-without-tabs">
+ <div class="col-md-3 property-name-column">{{t common.propertyName}}</div>
+ <div class="col-md-4 property-value-column">
+ {{t common.version}} {{selectedVersionRecord.version}}
+ {{#if selectedVersionRecord.isCurrent}}
+ <span class="label label-success">{{t common.current}}</span>
+ {{/if}}
+ </div>
+ <div class="col-md-4 col-md-offset-1 property-value-column">
+ {{t common.version}} {{compareServiceVersion.version}}
+ {{#if compareServiceVersion.isCurrent}}
+ <span class="label label-success">{{t common.current}}</span>
+ {{/if}}
+ </div>
+ </div>
+ {{/if}}
+ {{view App.ConfigCategoryContainerView categoriesBinding="selectedService.configCategories"
+ canEditBinding="view.canEdit" serviceBinding="selectedService"
+ serviceConfigsBinding="selectedService.configs" supportsHostOverridesBinding="view.supportsHostOverrides"}}
+ </div>
{{/if}}
{{#if view.isAllConfigsHidden}}
<div class="alert alert-info">
diff --git a/ambari-web/app/views/common/configs/service_config_view.js b/ambari-web/app/views/common/configs/service_config_view.js
index 58ccf12..590c0bc 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -75,7 +75,7 @@ App.ServiceConfigView = Em.View.extend({
*/
isOnTheServicePage: Em.computed.equal('controller.name', 'mainServiceInfoConfigsController'),
- classNameBindings: ['isOnTheServicePage:serviceConfigs'],
+ classNameBindings: ['isOnTheServicePage:serviceConfigs', 'controller.isCompareMode:settings-compare-layout'],
/**
* flag defines if any config match filter
--
To stop receiving notification emails like this one, please contact
atkach@apache.org.