Pārlūkot izejas kodu

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

aBabiichuk 10 gadi atpakaļ
vecāks
revīzija
477c56dfa7

+ 8 - 0
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",

+ 2 - 1
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 () {