ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject ambari git commit: AMBARI-12759 'Ranger DB host' missing in Customize Services page of Add Service Wizard. (ababiichuk)
Date Thu, 13 Aug 2015 08:58:41 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 69f2de83a -> 49244c78e


AMBARI-12759 'Ranger DB host' missing in Customize Services page of Add Service Wizard. (ababiichuk)


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

Branch: refs/heads/branch-2.1
Commit: 49244c78e237748c8918e386fd5f00886fd509f2
Parents: 69f2de8
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu Aug 13 11:55:38 2015 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu Aug 13 11:55:38 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/data/HDP2.3/site_properties.js                | 8 ++++++++
 .../app/models/configs/objects/service_config_property.js    | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/49244c78/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index f1fb484..cd16770 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -101,6 +101,7 @@ hdp23properties.push({
     "isOverridable": false,
     "isVisible": false,
     "isReconfigurable": false,
+    "isRequiredByAgent": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",
@@ -117,6 +118,7 @@ hdp23properties.push({
     "isOverridable": false,
     "isVisible": false,
     "isReconfigurable": false,
+    "isRequiredByAgent": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",
@@ -133,6 +135,7 @@ hdp23properties.push({
     "isOverridable": false,
     "isVisible": false,
     "isReconfigurable": false,
+    "isRequiredByAgent": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",
@@ -149,6 +152,7 @@ hdp23properties.push({
     "isOverridable": false,
     "isVisible": false,
     "isReconfigurable": false,
+    "isRequiredByAgent": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",
@@ -539,6 +543,7 @@ hdp23properties.push({
     "isOverridable": false,
     "isVisible": false,
     "isObserved": true,
+    "isRequiredByAgent": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",
@@ -555,6 +560,7 @@ hdp23properties.push({
     "isOverridable": false,
     "isVisible": false,
     "isObserved": true,
+    "isRequiredByAgent": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",
@@ -571,6 +577,7 @@ hdp23properties.push({
     "isOverridable": false,
     "isVisible": false,
     "isObserved": true,
+    "isRequiredByAgent": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",
@@ -587,6 +594,7 @@ hdp23properties.push({
     "isOverridable": false,
     "isVisible": false,
     "isObserved": true,
+    "isRequiredByAgent": false,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
     "category": "DBSettings",

http://git-wip-us.apache.org/repos/asf/ambari/blob/49244c78/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 6de9475..3495e08 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -197,10 +197,11 @@ App.ServiceConfigProperty = Em.Object.extend({
   isRemovable: function() {
     var isOriginalSCP = this.get('isOriginalSCP');
     var isUserProperty = this.get('isUserProperty');
+    var isRequiredByAgent = this.get('isRequiredByAgent');
     var isEditable = this.get('isEditable');
     var hasOverrides = this.get('overrides.length') > 0;
     // Removable when this is a user property, or it is not an original property and it is
editable
-    return isEditable && !hasOverrides && (isUserProperty || !isOriginalSCP);
+    return isEditable && !hasOverrides && isRequiredByAgent && (isUserProperty
|| !isOriginalSCP);
   }.property('isUserProperty', 'isOriginalSCP', 'overrides.length'),
 
   init: function () {


Mime
View raw message