ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [1/2] ambari git commit: AMBARI-14170 Config comparison page: Properties with empty value in the previous version being compared are shown as undefined. (ababiichuk)
Date Thu, 03 Dec 2015 09:50:05 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 04f420438 -> 53ab860fc


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/da1c64c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da1c64c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da1c64c1

Branch: refs/heads/trunk
Commit: da1c64c1f57d100151eeb472b43a0bc77c6bb8fb
Parents: 04f4204
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu Dec 3 09:48:27 2015 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu Dec 3 11:48:40 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/da1c64c1/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 0e33680..75bb44a 100644
--- a/ambari-web/app/mixins/common/configs/configs_comparator.js
+++ b/ambari-web/app/mixins/common/configs/configs_comparator.js
@@ -314,7 +314,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/da1c64c1/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index f1240bc..9a14c78 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -436,7 +436,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) {


Mime
View raw message