You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/12/03 10:53:31 UTC

ambari git commit: AMBARI-14170 Config comparison page: Properties with empty value in the previous version being compared are shown as undefined. (ababiichuk)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 4a3a3affd -> f8635b05a


AMBARI-14170 Config comparison page: Properties with empty value in the previous version being compared are shown as undefined. (ababiichuk)


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

Branch: refs/heads/branch-2.1
Commit: f8635b05a681be3ee720b96e7eacfd733d3b6983
Parents: 4a3a3af
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Dec 3 09:48:27 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Dec 3 11:53:23 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/mixins/common/configs/configs_comparator.js | 2 +-
 ambari-web/app/utils/config.js                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f8635b05/ambari-web/app/mixins/common/configs/configs_comparator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_comparator.js b/ambari-web/app/mixins/common/configs/configs_comparator.js
index f776e8c..732df0e 100644
--- a/ambari-web/app/mixins/common/configs/configs_comparator.js
+++ b/ambari-web/app/mixins/common/configs/configs_comparator.js
@@ -317,7 +317,7 @@ App.ConfigsComparator = Em.Mixin.create({
       isOverridable: false,
       isReconfigurable: false,
       isRequired: false,
-      isRequiredByAgent: false,
+      isRequiredByAgent: true,
       isSecureConfig: false,
       isUserProperty: true,
       isVisible: true,

http://git-wip-us.apache.org/repos/asf/ambari/blob/f8635b05/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 760cddf..f478fd3 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -494,7 +494,7 @@ App.config = Em.Object.create({
    * @returns {*}
    */
   formatPropertyValue: function(serviceConfigProperty, originalValue) {
-    var value = originalValue || Em.get(serviceConfigProperty, 'value'),
+    var value = Em.isNone(originalValue) ? Em.get(serviceConfigProperty, 'value') : originalValue,
         displayType = Em.get(serviceConfigProperty, 'displayType') || Em.get(serviceConfigProperty, 'valueAttributes.type'),
         category = Em.get(serviceConfigProperty, 'category');
     switch (displayType) {