Bläddra i källkod

AMBARI-12990. User may click Next while Rerun Checks is executing (onechiporenko)

Oleg Nechiporenko 9 år sedan
förälder
incheckning
fbbd684e69

+ 3 - 0
ambari-web/app/controllers/wizard/step3_controller.js

@@ -1712,6 +1712,8 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
 
       primary: Em.I18n.t('common.close'),
 
+      autoHeight: false,
+
       onPrimary: function () {
         self.set('checksUpdateStatus', null);
         this.hide();
@@ -1727,6 +1729,7 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
       },
 
       didInsertElement: function () {
+        this._super();
         this.fitHeight();
       },
 

+ 5 - 0
ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js

@@ -55,6 +55,11 @@ App.SelectDefinitionsPopupBodyView = App.TableView.extend({
     this.filteredContentObsOnce();
   },
 
+  /**
+   * Default filter isn't needed
+   */
+  filter: Em.K,
+
   filterDefs: function () {
     var showOnlySelectedDefs = this.get('showOnlySelectedDefs');
     var filterComponent = this.get('filterComponent');