ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-12990. User may click Next while Rerun Checks is executing (onechiporenko)
Date Thu, 03 Sep 2015 10:14:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b9a0b39ca -> fbbd684e6


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


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

Branch: refs/heads/trunk
Commit: fbbd684e69b2b859b4580038cc011c9cb2ab0141
Parents: b9a0b39
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Thu Sep 3 13:01:56 2015 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Thu Sep 3 13:14:40 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step3_controller.js           | 3 +++
 .../manage_alert_groups/select_definitions_popup_body_view.js   | 5 +++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fbbd684e/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index af4c7d3..658e26c 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/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();
       },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fbbd684e/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js
b/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js
index b92ddad..e7a23a3 100644
--- a/ambari-web/app/views/main/alerts/manage_alert_groups/select_definitions_popup_body_view.js
+++ b/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');


Mime
View raw message