You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/08/06 11:32:52 UTC
ambari git commit: AMBARI-12612. Namenode dir textarea vanishes when
value contains /home in path (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 6dc2c7f75 -> 07319d530
AMBARI-12612. Namenode dir textarea vanishes when value contains /home in path (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/07319d53
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/07319d53
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/07319d53
Branch: refs/heads/trunk
Commit: 07319d530980d1fa48bd24fc9397cb467a2dba29
Parents: 6dc2c7f
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Thu Aug 6 12:29:12 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Aug 6 12:29:12 2015 +0300
----------------------------------------------------------------------
ambari-web/app/templates/common/configs/widgets/controls.hbs | 4 ++--
.../views/common/configs/widgets/combo_config_widget_view.js | 2 +-
.../app/views/common/configs/widgets/config_widget_view.js | 8 ++++----
.../views/common/configs/widgets/list_config_widget_view.js | 2 +-
.../common/configs/widgets/slider_config_widget_view.js | 2 +-
.../common/configs/widgets/time_interval_spinner_view.js | 2 +-
.../common/configs/widgets/toggle_config_widget_view.js | 2 +-
.../views/common/configs/widgets/config_widget_view_test.js | 1 +
8 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/07319d53/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 8b6f785..210f942 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 @@
<div {{bindAttr class="view.isPropertyUndefined::hide :left :widget-config-raw"}}>
<i>{{t common.property.undefined}}</i>
</div>
-{{#if view.supportSwitchToCheckBox}}
+{{#if view.supportSwitchToTextBox}}
{{#unless view.isPropertyUndefined}}
<div {{bindAttr class="view.config.showAsTextBox::hide :left :widget-config-raw"}}>
{{view App.PlainConfigTextField sectionBinding="view.section" subSectionBinding="view.subSection" configBinding="view.config" disabledBinding="view.canNotEdit"}}
@@ -144,4 +144,4 @@
{{#if view.isComparison}}
<div class="clearfix"></div>
{{view App.ConfigWidgetComparisonView serviceConfigPropertyBinding="view.config"}}
-{{/if}}
\ No newline at end of file
+{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/07319d53/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
index 32a051d..0bf05f6 100644
--- a/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
@@ -25,7 +25,7 @@ var App = require('app');
App.ComboConfigWidgetView = App.ConfigWidgetView.extend({
templateName: require('templates/common/configs/widgets/combo_config_widget'),
classNames: ['widget-config', 'combo-widget'],
- supportSwitchToCheckBox: true,
+ supportSwitchToTextBox: true,
/**
* Object with following structure:
* {String} .value - value in widget format
http://git-wip-us.apache.org/repos/asf/ambari/blob/07319d53/ambari-web/app/views/common/configs/widgets/config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index 2ca6aff..354a44e 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -101,14 +101,14 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
* Determines if user can switch custom widget-view to the input-field
* @type {boolean}
*/
- supportSwitchToCheckBox: false,
+ supportSwitchToTextBox: false,
/**
* @type {boolean}
*/
showPencil: function () {
- return this.get('supportSwitchToCheckBox') && !this.get('disabled');
- }.property('supportSwitchToCheckBox', 'disabled'),
+ return this.get('supportSwitchToTextBox') && !this.get('disabled');
+ }.property('supportSwitchToTextBox', 'disabled'),
/**
* Alias to <code>config.isOriginalSCP</code>
@@ -432,7 +432,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
* @returns {boolean}
*/
isValueCompatibleWithWidget: function() {
- return (this.get('isOverrideEqualityError') && !this.get('config.isValid')) || this.get('config.isValid');
+ return (this.get('isOverrideEqualityError') && !this.get('config.isValid')) || this.get('config.isValid') || !this.get('supportSwitchToTextBox');
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/07319d53/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
index 0973898..fcf2aac 100644
--- a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
@@ -41,7 +41,7 @@ var configOption = Em.Object.extend({
*/
App.ListConfigWidgetView = App.ConfigWidgetView.extend({
classNames: ['widget-config', 'list-widget'],
- supportSwitchToCheckBox: true,
+ supportSwitchToTextBox: true,
/**
* Counter used to determine order of options selection (<code>order<code>-field in the <code>configOption</code>)
http://git-wip-us.apache.org/repos/asf/ambari/blob/07319d53/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index 77161e3..8f42336 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -31,7 +31,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
templateName: require('templates/common/configs/widgets/slider_config_widget'),
- supportSwitchToCheckBox: true,
+ supportSwitchToTextBox: true,
/**
* Slider-object created on the <code>initSlider</code>
http://git-wip-us.apache.org/repos/asf/ambari/blob/07319d53/ambari-web/app/views/common/configs/widgets/time_interval_spinner_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/time_interval_spinner_view.js b/ambari-web/app/views/common/configs/widgets/time_interval_spinner_view.js
index e128094..8663ac3 100644
--- a/ambari-web/app/views/common/configs/widgets/time_interval_spinner_view.js
+++ b/ambari-web/app/views/common/configs/widgets/time_interval_spinner_view.js
@@ -22,7 +22,7 @@ App.TimeIntervalSpinnerView = App.ConfigWidgetView.extend({
templateName: require('templates/common/configs/widgets/time_interval_spinner'),
classNames: ['widget-config', 'spinner-input-widget'],
- supportSwitchToCheckBox: true,
+ supportSwitchToTextBox: true,
/**
* @property isValid
http://git-wip-us.apache.org/repos/asf/ambari/blob/07319d53/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js
index 91b7666..68a63fb 100644
--- a/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/toggle_config_widget_view.js
@@ -58,7 +58,7 @@ App.ToggleConfigWidgetView = App.ConfigWidgetView.extend({
*/
skipRequestForDependencies: false,
- supportSwitchToCheckBox: true,
+ supportSwitchToTextBox: true,
/**
* Update config value using <code>switcherValue</code>.
http://git-wip-us.apache.org/repos/asf/ambari/blob/07319d53/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js b/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js
index 91610e8..d2523ac 100644
--- a/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js
+++ b/ambari-web/test/views/common/configs/widgets/config_widget_view_test.js
@@ -249,6 +249,7 @@ describe('App.ConfigWidgetView', function () {
it('fail validation', function() {
view.set('config.isValid', false);
+ view.set('supportSwitchToTextBox', true);
expect(view.isValueCompatibleWithWidget()).to.be.false;
});
});