فهرست منبع

AMBARI-11374. After Adding A New Service dfs.namenode.checkpoint.dir Is Removed (alexantonenko)

Alex Antonenko 10 سال پیش
والد
کامیت
46b159a2d8

+ 1 - 3
ambari-web/app/controllers/main/service/info/configs.js

@@ -830,9 +830,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
         if (App.get('isHaEnabled')) {
           var c = serviceConfig.configs,
             removedConfigs = c.filterProperty('category', 'SECONDARY_NAMENODE');
-          removedConfigs.map(function (config) {
-            c = c.without(config);
-          });
+          removedConfigs.setEach('isVisible', false);
           serviceConfig.configs = c;
         }
       }

+ 1 - 3
ambari-web/app/controllers/wizard/step7_controller.js

@@ -754,9 +754,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
         var c = serviceConfigs.findProperty('serviceName', 'HDFS').configs,
           nameServiceId = c.findProperty('name', 'dfs.nameservices'),
           removedConfigs = c.filterProperty('category', 'SECONDARY_NAMENODE');
-        removedConfigs.map(function (config) {
-          c = c.without(config);
-        });
+        removedConfigs.setEach('isVisible', false);
         serviceConfigs.findProperty('serviceName', 'HDFS').configs = c;
 
         if(this.get('selectedServiceNames').contains('HBASE') && nameServiceId){

+ 6 - 6
ambari-web/test/controllers/wizard/step7_test.js

@@ -1254,11 +1254,11 @@ describe('App.InstallerStep7Controller', function () {
         Em.Object.create({
           serviceName: 'HDFS',
           configs: [
-            {category: 'SECONDARY_NAMENODE'},
-            {category: 'SECONDARY_NAMENODE'},
-            {category: 'NameNode'},
-            {category: 'NameNode'},
-            {category: 'SECONDARY_NAMENODE'}
+            Em.Object.create({category: 'SECONDARY_NAMENODE'}),
+            Em.Object.create({category: 'SECONDARY_NAMENODE'}),
+            Em.Object.create({category: 'NameNode'}),
+            Em.Object.create({category: 'NameNode'}),
+            Em.Object.create({category: 'SECONDARY_NAMENODE'})
           ]
         }),
         Em.Object.create({serviceName: 's2'})]
@@ -1271,7 +1271,7 @@ describe('App.InstallerStep7Controller', function () {
       installerStep7Controller.setStepConfigs([], []);
       expect(installerStep7Controller.get('stepConfigs').everyProperty('showConfig', true)).to.equal(true);
       expect(installerStep7Controller.get('stepConfigs').findProperty('serviceName', 'HDFS').get('selected')).to.equal(true);
-      expect(installerStep7Controller.get('stepConfigs').findProperty('serviceName', 'HDFS').get('configs').length).to.equal(2);
+      expect(installerStep7Controller.get('stepConfigs').findProperty('serviceName', 'HDFS').get('configs').length).to.equal(5);
       App.get.restore();
     });