ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-11336. An alter 'Number of threads used by Compactor' shows after you turn on ACID Transactions and then turn off (atkach)
Date Fri, 22 May 2015 11:06:56 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 254fba3fe -> 5e1402003


AMBARI-11336. An alter 'Number of threads used by Compactor' shows after you turn on ACID
Transactions and then turn off (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e140200
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e140200
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e140200

Branch: refs/heads/trunk
Commit: 5e14020039568ca5057c20ebc1f084691bc55eef
Parents: 254fba3
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Fri May 22 14:04:33 2015 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Fri May 22 14:04:33 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/mixins/unit_convert/base_unit_convert_mixin.js | 2 ++
 .../views/common/configs/widgets/slider_config_widget_view.js | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5e140200/ambari-web/app/mixins/unit_convert/base_unit_convert_mixin.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/unit_convert/base_unit_convert_mixin.js b/ambari-web/app/mixins/unit_convert/base_unit_convert_mixin.js
index 7a324f8..a073fbd 100644
--- a/ambari-web/app/mixins/unit_convert/base_unit_convert_mixin.js
+++ b/ambari-web/app/mixins/unit_convert/base_unit_convert_mixin.js
@@ -34,6 +34,8 @@ App.BaseUnitConvertMixin = Em.Mixin.create({
    */
   currentDimensionType: null,
 
+  units: ['b', 'kb', 'mb', 'gb', 'tb', 'pb'],
+
   /**
    * Labels related to units. Specify desired display names here that not much actual unit
name.
    */

http://git-wip-us.apache.org/repos/asf/ambari/blob/5e140200/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 968ae38..0e9421a 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
@@ -92,7 +92,6 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
     return step ? parseFunction(step) : this.get('unitType') === 'int' ? 1 : 0.1;
   }.property('config.stackConfigProperty.valueAttributes.increment_step'),
 
-
   /**
    * Default value of config property transformed according widget format
    * @returns {Number}
@@ -111,8 +110,6 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
     return parseFunction(this.widgetValueByConfigAttributes(this.get('config.recommendedValue')));
   }.property('config.recommendedValue'),
 
-  units: ['b', 'kb', 'mb', 'gb', 'tb', 'pb'],
-
   /**
    * unit type of widget
    * @type {String}
@@ -235,7 +232,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
         }
       }
       // avoid precision during restore value
-      if (parsed == parseFunction(this.widgetValueByConfigAttributes(this.get('config.savedValue'))))
{
+      if (!Em.isNone(this.get('config.savedValue')) && parsed == parseFunction(this.widgetValueByConfigAttributes(this.get('config.savedValue'))))
{
         this.set('config.value', this.get('config.savedValue'));
       }
     } else {
@@ -245,9 +242,9 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
   },
 
   /**
+   * set widget value same as config value
    * @override
    * @method setValue
-   * set widget value same as config value
    */
   setValue: function(value) {
     var parseFunction = this.get('parseFunction');


Mime
View raw message