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 2015/05/28 20:16:12 UTC
[1/3] ambari git commit: AMBARI-11494. Should HDFS ssl-client configs
(passwords) have "override" and "undo" icons? (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 62bfe93cc -> f81b4f896
AMBARI-11494. Should HDFS ssl-client configs (passwords) have "override" and "undo" icons? (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7dfcbe27
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7dfcbe27
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7dfcbe27
Branch: refs/heads/trunk
Commit: 7dfcbe27b2373139f5da2d356d3b584b5b36c730
Parents: 62bfe93
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu May 28 21:14:07 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu May 28 21:14:07 2015 +0300
----------------------------------------------------------------------
.../models/configs/objects/service_config_property.js | 9 +++++----
ambari-web/app/utils/config.js | 2 +-
.../configs/objects/service_config_property_test.js | 12 ++++++++----
3 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7dfcbe27/ambari-web/app/models/configs/objects/service_config_property.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js
index ad4de55..f7dcd2d 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -195,9 +195,6 @@ App.ServiceConfigProperty = Em.Object.extend({
}.property('isUserProperty', 'isOriginalSCP', 'overrides.length'),
init: function () {
- if(this.get("displayType")=="password"){
- this.set('retypedPassword', this.get('value'));
- }
if ((this.get('id') === 'puppet var') && this.get('value') == '') {
if (this.get('savedValue')) {
this.set('value', this.get('savedValue'));
@@ -205,6 +202,10 @@ App.ServiceConfigProperty = Em.Object.extend({
this.set('value', this.get('recommendedValue'));
}
}
+ if(this.get("displayType") === "password"){
+ this.set('retypedPassword', this.get('value'));
+ this.set('recommendedValue', '');
+ }
this.set('initialValue', this.get('value'));
},
@@ -271,7 +272,7 @@ App.ServiceConfigProperty = Em.Object.extend({
* @type {boolean}
*/
overrideAvailable: function () {
- return !this.get('isComparison') && this.get('isPropertyOverridable');
+ return !this.get('isComparison') && this.get('isPropertyOverridable') && (this.get('displayType') !== 'password');
}.property('isPropertyOverridable', 'isComparison'),
isValid: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/7dfcbe27/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 353168b..32553e8 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -320,7 +320,7 @@ App.config = Em.Object.create({
name: index,
value: value,
savedValue: value,
- recommendedValue: advancedConfig ? Em.get(advancedConfig, 'recommencedValue') : null,
+ recommendedValue: advancedConfig ? Em.get(advancedConfig, 'recommendedValue') : null,
filename: filename,
isUserProperty: !advancedConfig,
isVisible: !!service,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7dfcbe27/ambari-web/test/models/configs/objects/service_config_property_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/configs/objects/service_config_property_test.js b/ambari-web/test/models/configs/objects/service_config_property_test.js
index 5eb8c3e..08f9cb0 100644
--- a/ambari-web/test/models/configs/objects/service_config_property_test.js
+++ b/ambari-web/test/models/configs/objects/service_config_property_test.js
@@ -175,20 +175,24 @@ var serviceConfigProperty,
{
initial: {
displayType: 'password',
- value: 'value'
+ value: 'value',
+ recommendedValue: 'recommended'
},
result: {
- retypedPassword: 'value'
+ retypedPassword: 'value',
+ recommendedValue: ''
}
},
{
initial: {
id: 'puppet var',
value: '',
- savedValue: 'default'
+ savedValue: 'default',
+ recommendedValue: 'recommended'
},
result: {
- value: 'default'
+ value: 'default',
+ recommendedValue: 'recommended'
}
}
],
[2/3] ambari git commit: AMBARI-11496. No tooltip shown when
configuration is in Edit (escape hatch) mode (alexantonenko)
Posted by al...@apache.org.
AMBARI-11496. No tooltip shown when configuration is in Edit (escape hatch) mode (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be7aa40d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be7aa40d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be7aa40d
Branch: refs/heads/trunk
Commit: be7aa40d5fbf267359c29209e66bc03fd184ad12
Parents: 7dfcbe2
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu May 28 21:14:55 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu May 28 21:14:55 2015 +0300
----------------------------------------------------------------------
.../service/configs/widget_popover_support.js | 7 +++++--
.../common/configs/widgets/controls.hbs | 2 +-
.../configs/widgets/plain_config_text_field.js | 19 ++++++++++++-------
3 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/be7aa40d/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/main/service/configs/widget_popover_support.js b/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
index ca381ce..3974465 100644
--- a/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
+++ b/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
@@ -48,8 +48,11 @@ App.WidgetPopoverSupport = Em.Mixin.create({
initPopover: function () {
if (this.get('isPopoverEnabled') !== false) {
- var leftPopoverTemplate = '<div class="popover config-widget-left-popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>';
- App.popover(this.$('.original-widget'), {
+ var leftPopoverTemplate = '<div class="popover config-widget-left-popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>',
+ isWidget = !Em.isEmpty(this.$('.original-widget')),
+ popoverSelector = isWidget ? this.$('.original-widget') : this.$('.input-append');
+
+ App.popover(popoverSelector, {
template: this.get('popoverPlacement') == 'left'? leftPopoverTemplate : undefined,
title: Em.I18n.t('installer.controls.serviceConfigPopover.title').format(
this.get('configLabel'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/be7aa40d/ambari-web/app/templates/common/configs/widgets/controls.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index 4e634cb..da8e1ac 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -19,7 +19,7 @@
{{#if view.supportSwitchToCheckBox}}
<div {{bindAttr class="view.config.showAsTextBox::hide :left :widget-config-raw"}}>
- {{view App.PlainConfigTextField serviceConfigBinding="view.config" disabledBinding="view.canNotEdit"}}
+ {{view App.PlainConfigTextField sectionBinding="view.section" subSectionBinding="view.subSection" configBinding="view.config" disabledBinding="view.canNotEdit"}}
</div>
{{/if}}
{{#if view.canEdit}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/be7aa40d/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js b/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
index 05f3584..e49bba0 100644
--- a/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
+++ b/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
@@ -24,15 +24,19 @@
var App = require('app');
require('views/common/controls_view');
-App.PlainConfigTextField = Ember.View.extend(App.SupportsDependentConfigs, {
+App.PlainConfigTextField = Ember.View.extend(App.SupportsDependentConfigs, App.WidgetPopoverSupport, {
templateName: require('templates/common/configs/widgets/plain_config_text_field'),
- valueBinding: 'serviceConfig.value',
+ valueBinding: 'config.value',
classNames: ['widget-config-plain-text-field'],
- placeholderBinding: 'serviceConfig.savedValue',
+ placeholderBinding: 'config.savedValue',
+
+ configLabel: function() {
+ return this.get('config.stackConfigProperty.displayName') || this.get('config.displayName') || this.get('config.name');
+ }.property('config.name', 'config.displayName'),
unit: function() {
- return Em.getWithDefault(this, 'serviceConfig.stackConfigProperty.valueAttributes.unit', false);
- }.property('serviceConfig.stackConfigProperty.valueAttributes.unit'),
+ return Em.getWithDefault(this, 'config.stackConfigProperty.valueAttributes.unit', false);
+ }.property('config.stackConfigProperty.valueAttributes.unit'),
displayUnit: function() {
var unit = this.get('unit');
@@ -43,7 +47,7 @@ App.PlainConfigTextField = Ember.View.extend(App.SupportsDependentConfigs, {
}.property('unit'),
focusOut: function () {
- this.sendRequestRorDependentConfigs(this.get('serviceConfig'));
+ this.sendRequestRorDependentConfigs(this.get('config'));
},
insertNewline: function() {
@@ -52,7 +56,8 @@ App.PlainConfigTextField = Ember.View.extend(App.SupportsDependentConfigs, {
didInsertElement: function() {
this._super();
- this.set('serviceConfig.displayType', Em.getWithDefault(this, 'serviceConfig.stackConfigProperty.valueAttributes.type', 'string'));
+ this.initPopover();
+ this.set('config.displayType', Em.getWithDefault(this, 'config.stackConfigProperty.valueAttributes.type', 'string'));
}
});
[3/3] ambari git commit: AMBARI-11497. On HDFS config page Modify
"Minimum replicated blocks %ge" to simply say "Minimum replicated blocks %"
(alexantonenko)
Posted by al...@apache.org.
AMBARI-11497. On HDFS config page Modify "Minimum replicated blocks %ge" to simply say "Minimum replicated blocks %" (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f81b4f89
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f81b4f89
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f81b4f89
Branch: refs/heads/trunk
Commit: f81b4f8966d14b941d9f503ff386d39f996d9337
Parents: be7aa40
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu May 28 21:15:32 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu May 28 21:15:32 2015 +0300
----------------------------------------------------------------------
.../common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f81b4f89/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
index 3c4f392..a34d8c0 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
@@ -174,7 +174,7 @@
Values less than or equal to 0 mean not to start in safe mode.
Values greater than 1 will make safe mode permanent.
</description>
- <display-name>Minimum replicated blocks %ge</display-name>
+ <display-name>Minimum replicated blocks %</display-name>
<value-attributes>
<type>float</type>
<minimum>0.990</minimum>