Преглед на файлове

AMBARI-12988. Kerberos descriptor should be reconfigurable for manual KDC type. (jaimin)

Jaimin Jetly преди 9 години
родител
ревизия
0e5d3fe73c
променени са 2 файла, в които са добавени 14 реда и са изтрити 8 реда
  1. 7 1
      ambari-web/app/controllers/main/admin/kerberos.js
  2. 7 7
      ambari-web/app/templates/main/admin/kerberos.hbs

+ 7 - 1
ambari-web/app/controllers/main/admin/kerberos.js

@@ -521,7 +521,13 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({
       });
     };
     this.updateKerberosDescriptor(kerberosDescriptor, configs);
-    this.restartServicesAfterRegenerate(false, callback);
+    if (this.get('isManualKerberos')) {
+      callback().done(function () {
+        self.regenerateKeytabsRequest(false,false);
+      });
+    } else {
+      this.restartServicesAfterRegenerate(false, callback);
+    }
   }
 
 });

+ 7 - 7
ambari-web/app/templates/main/admin/kerberos.hbs

@@ -24,13 +24,13 @@
           {{#unless isManualKerberos}}
             <button class="btn btn-success" {{bindAttr disabled="isKerberosButtonsDisabled"}} {{action regenerateKeytabs target="controller"}}>
               <i class="icon-repeat"></i> {{t admin.kerberos.button.regenerateKeytabs}}</button>
-            <br/>
-            {{#unless isEditMode}}
-              <a {{action makeConfigsEditable target="controller"}}
-                      class="pull-right edit-link">
-                {{t common.edit}}
-              </a>
-            {{/unless}}
+          {{/unless}}
+          <br/>
+          {{#unless isEditMode}}
+            <a {{action makeConfigsEditable target="controller"}}
+                    class="pull-right edit-link">
+              {{t common.edit}}
+            </a>
           {{/unless}}
         {{/isAccessible}}
       </p>